diff --git a/css/glowingbear.css b/css/glowingbear.css
index a4d5a07..1ff584d 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -256,7 +256,6 @@ input[type=text], input[type=password], .badge {
     position: relative;
     height: 98%;
     overflow-y: auto;
-    margin-left: 145px;    /* sidebar */
     width: auto;
     top: 35px; /* topbar */
     padding-bottom: 10px;
@@ -267,6 +266,9 @@ input[type=text], input[type=password], .badge {
 .withnicklist {
     margin-right: 100px !important; /* nicklist */
 }
+.withsidebar {
+    margin-left: 145px;    /* sidebar */
+}
 #bufferlines .btn {
     font-family: sans-serif;
 }
diff --git a/index.html b/index.html
index 3c8fb7b..92c24fd 100644
--- a/index.html
+++ b/index.html
@@ -289,7 +289,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           </li>
         </ul>
       </div>
-      <div bindonce id="bufferlines" class="monospace" ng-class="{'withnicklist': showNicklist}">
+      <div bindonce id="bufferlines" class="monospace" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
         <div id="nicklist" ng-show="showNicklist" ng-swipe-right="closeNick()" class="vertical-line-left">
           <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist">
             <li ng-repeat="nick in group.nicks|orderBy:'name'" ng-click="openBuffer(nick.name)">
@@ -334,7 +334,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
       <div class="push"></div>
     </div>
     <div id="footer" ng-show="connected">
-      <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist}">
+      <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
         <div input-bar></div>
     </div>
   </body>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 60da9c8..5b7d92d 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -629,16 +629,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Open and close panels while on mobile devices through swiping
     $scope.swipeSidebar = function() { 
         $scope.showSidebar = !$scope.showSidebar;
-        // remove or add margin if big screen
-        if (document.body.clientWidth > mobile_cutoff) {
-            if($scope.showSidebar) {
-                $('#bufferlines').css('margin-left','145px');
-                $('.navbar-fixed-bottom').css('margin-left','145px');
-            }else{
-                $('#bufferlines').css('margin-left','0');
-                $('.navbar-fixed-bottom').css('margin-left','0');
-            }
-        }
     };
     
     $scope.openNick = function() {