diff --git a/js/glowingbear.js b/js/glowingbear.js
index 78da583..20ea209 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -605,7 +605,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         else if (code === 13) {
             $event.preventDefault();
             if ($scope.filteredBuffers.length > 0) {
-                models.setActiveBuffer($scope.filteredBuffers[0].id);
+                $scope.setActiveBuffer($scope.filteredBuffers[0].id);
             }
             $scope.search = '';
         }
diff --git a/js/inputbar.js b/js/inputbar.js
index 54ea52c..a7fa229 100644
--- a/js/inputbar.js
+++ b/js/inputbar.js
@@ -167,7 +167,7 @@ weechat.directive('inputBar', function() {
                     });
                     var activeBufferId = sortedBuffers[bufferNumber];
                     if (activeBufferId) {
-                        models.setActiveBuffer(activeBufferId[1]);
+                        $scope.$parent.setActiveBuffer(activeBufferId[1]);
                         $event.preventDefault();
                     }
                 }
@@ -236,6 +236,9 @@ weechat.directive('inputBar', function() {
                 // Alt+G -> focus on buffer filter input
                 if ($event.altKey && (code === 103 || code === 71)) {
                     $event.preventDefault();
+                    if (!$scope.$parent.isSidebarVisible()) {
+                        $scope.$parent.showSidebar();
+                    }
                     document.getElementById('bufferFilter').focus();
                     return true;
                 }