diff --git a/static/js/directives/buddylist.js b/static/js/directives/buddylist.js
index be86856d..f18b7584 100644
--- a/static/js/directives/buddylist.js
+++ b/static/js/directives/buddylist.js
@@ -55,7 +55,7 @@ define(['underscore', 'text!partials/buddylist.html'], function(_, template) {
                     $scope.enabled = status;
                     $scope.$emit("roomStatus", status);
                 }
-                if (status) {
+                if (status && !$scope.layout.buddylistAutoHide) {
                     $scope.layout.buddylist = true
                 }
             };