diff --git a/js/glowingbear.js b/js/glowingbear.js
index ecb121a..7b21ed5 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -975,8 +975,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         if ($scope.nonicklist) {
             return false;
         }
-        // Use flat nicklist to check if empty
-        if (ab.flatNicklist().length === 0) {
+        // Check if nicklist is empty
+        if (ab.isNicklistEmpty()) {
             return false;
         }
         return true;
diff --git a/js/models.js b/js/models.js
index 427aa79..db330bd 100644
--- a/js/models.js
+++ b/js/models.js
@@ -147,6 +147,13 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
             }
         };
 
+        var isNicklistEmpty = function() {
+            for (var obj in nicklist) {
+                return false;
+            }
+            return true;
+        };
+
         return {
             id: pointer,
             fullName: fullName,
@@ -171,7 +178,8 @@ models.service('models', ['$rootScope', '$filter', function($rootScope, $filter)
             history: history,
             addToHistory: addToHistory,
             getHistoryUp: getHistoryUp,
-            getHistoryDown: getHistoryDown
+            getHistoryDown: getHistoryDown,
+            isNicklistEmpty: isNicklistEmpty
         };
 
     };