diff --git a/css/glowingbear.css b/css/glowingbear.css
index 9b9e16c..e5faf52 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -835,6 +835,10 @@ img.emojione {
         bottom: 0px;
     }
 
+    .content[sidebar-state=visible] #nicklist {
+        display: none;
+    }
+
     .navbar-fixed-bottom {
         margin: 0;
     }
diff --git a/index.html b/index.html
index e8063ce..896e178 100644
--- a/index.html
+++ b/index.html
@@ -310,14 +310,14 @@ npm run build-electron-{windows, darwin, linux}</pre>
           </li>
         </ul>
       </div>
+      <div id="nicklist" ng-if="showNicklist" ng-swipe-right="swipeRight()" ng-swipe-disable-mouse class="vertical-line-left">
+        <ul class="nicklistgroup list-unstyled" ng-repeat="group in nicklist">
+          <li ng-repeat="nick in group.nicks|orderBy:'name'">
+            <a ng-click="openBuffer(nick.name)"><span ng-class="::nick.prefixClasses" ng-bind="::nick.prefix"></span><span ng-class="::nick.nameClasses" ng-bind="::nick.name"></span></a>
+          </li>
+        </ul>
+      </div>
       <div id="bufferlines" class="favorite-font" ng-swipe-right="swipeRight()" ng-swipe-left="swipeLeft()" ng-swipe-disable-mouse ng-class="{'withnicklist': showNicklist}" when-scrolled="infiniteScroll()" imgur-drop>
-        <div id="nicklist" ng-if="showNicklist" ng-swipe-right="swipeRight()" ng-swipe-disable-mouse class="vertical-line-left">
-          <ul class="nicklistgroup list-unstyled" ng-repeat="group in nicklist">
-            <li ng-repeat="nick in group.nicks|orderBy:'name'">
-              <a ng-click="openBuffer(nick.name)"><span ng-class="::nick.prefixClasses" ng-bind="::nick.prefix"></span><span ng-class="::nick.nameClasses" ng-bind="::nick.name"></span></a>
-            </li>
-          </ul>
-        </div>
         <table>
           <tbody>
             <tr class="bufferline">