diff --git a/css/glowingbear.css b/css/glowingbear.css
index 17f44dc..a1de921 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -204,17 +204,19 @@ input[type=text], input[type=password], .badge {
     height: 99%;
     overflow-y: auto;
     margin-left: 14%;    /* sidebar */
-    margin-right: 100px; /* nicklist */
     width: auto;
     top: 25px; /* topbar */
     padding-bottom: 10px;
 }
+.withnicklist {
+    margin-right: 100px !important; /* nicklist */
+}
 #bufferlines .btn {
     font-family: sans-serif;
 }
 
 .navbar-fixed-bottom {
-    margin: 0 105px 0 14%;
+    margin: 0 5px 0 14%;
 }
 .navbar-inverse {
     background-color: #181818;
diff --git a/index.html b/index.html
index 908ed18..115afdd 100644
--- a/index.html
+++ b/index.html
@@ -223,7 +223,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
           </li>
         </ul>
       </div>
-      <div id="bufferlines">
+      <div id="bufferlines" ng-class="{'withnicklist': nonicklist==false}">
         <div id="nicklist" ng-hide="nonicklist" class="vertical-line-left">
           <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray">
             <li class="" ng-repeat="nick in group.nicks">
@@ -266,7 +266,7 @@ $ openssl req -nodes -newkey rsa:2048 -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">
+      <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': nonicklist==false}">
         <form class="form form-horizontal" ng-submit="sendMessage()">
           <div class="input-group">
             <input id="sendMessage" type="text" class="form-control" autocomplete="off" ng-model="command" autofocus>
diff --git a/js/websockets.js b/js/websockets.js
index 15aceee..8856545 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -458,7 +458,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     // Save setting for displaying nicklist
     $store.bind($scope, "nonicklist", false); 
 
-
     $scope.setActiveBuffer = function(key) {
         models.setActiveBuffer(key);
     };