diff --git a/css/glowingbear.css b/css/glowingbear.css
index a98992c..a4d5a07 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -174,9 +174,17 @@ input[type=text], input[type=password], .badge {
     overflow-x: hidden;
     margin-top: 35px; /* topbar */
     font-size: smaller;
+    -webkit-transition:0.35s ease all;
+    transition:0.35s ease all;
 }
 #sidebar form {
 }
+#sidebar.ng-hide-add, #sidebar.ng-hide-remove {
+  /* this needs to be here to make it visible during the animation
+     since the .ng-hide class is already on the element rendering
+     it as hidden. */
+  display:block!important;
+}
 
 #sidebar .badge {
     border-radius: 0;
@@ -187,6 +195,10 @@ input[type=text], input[type=password], .badge {
     padding-left: 10px;
 }
 
+#sidebar.ng-hide {
+  width: 0;
+}
+
 #nicklist {
     position: fixed;
     width: 100px;
@@ -249,6 +261,8 @@ input[type=text], input[type=password], .badge {
     top: 35px; /* topbar */
     padding-bottom: 10px;
     margin-right: -5px;
+    -webkit-transition:0.35s ease all;
+    transition:0.35s ease all;
 }
 .withnicklist {
     margin-right: 100px !important; /* nicklist */
@@ -259,6 +273,8 @@ input[type=text], input[type=password], .badge {
 
 .navbar-fixed-bottom {
     margin: 0 5px 0 145px; /* sidebar */
+    -webkit-transition:0.35s ease all;
+    transition:0.35s ease all;
 }
 .navbar-inverse {
     background-color: #181818;
@@ -311,7 +327,6 @@ table.notimestamp td.time {
     display: none;
 }
 
-
 /* */
 /* Mobile layout */
 /* */
diff --git a/index.html b/index.html
index 62fc52e..3c8fb7b 100644
--- a/index.html
+++ b/index.html
@@ -18,6 +18,7 @@
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular-route.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular-sanitize.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular-touch.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.12/angular-animate.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script>
     <script type="text/javascript" src="3rdparty/inflate.min.js"></script>
     <script type="text/javascript" src="js/localstorage.js"></script>
@@ -183,7 +184,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
     <div class="content" ng-show="connected">
       <div id="topbar">
         <div class="brand">
-          <a href="#" data-target="#sidebar" data-toggle="collapse">
+          <a href="#" ng-click="swipeSidebar()">
             <img alt="brand" src="img/favicon.png" title="Connected to {{ host }}:{{ port}}">
           </a>
           <button ng-show="debugMode" ng-click="countWatchers()">Count<br />Watchers</button>
@@ -272,7 +273,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           </a>
         </div>
       </div>
-      <div bindonce id="sidebar" ng-swipe-left="swipeSidebar()" class="vertical-line collapse in">
+      <div bindonce id="sidebar" ng-show="showSidebar" ng-swipe-left="swipeSidebar()" class="vertical-line">
         <ul class="nav nav-pills nav-stacked" ng-class="{'indented': (predicate === 'serverSortKey')}">
           <li class="bufferfilter">
             <form role="form">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 8b075e8..60da9c8 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -1,4 +1,4 @@
-var weechat = angular.module('weechat', ['ngRoute', 'localStorage', 'weechatModels', 'plugins', 'ngSanitize', 'ngWebsockets', 'pasvaz.bindonce', 'ngTouch']);
+var weechat = angular.module('weechat', ['ngRoute', 'localStorage', 'weechatModels', 'plugins', 'ngSanitize', 'ngWebsockets', 'pasvaz.bindonce', 'ngTouch', 'ngAnimate']);
 
 weechat.filter('toArray', function () {
     'use strict';
@@ -581,6 +581,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         }
     });
 
+    $scope.showSidebar = true;
+
     $scope.buffers = models.model.buffers;
     $scope.activeBuffer = models.getActiveBuffer;
 
@@ -626,8 +628,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     // Open and close panels while on mobile devices through swiping
     $scope.swipeSidebar = function() { 
-        if (document.body.clientWidth < mobile_cutoff) {
-            $('#sidebar').collapse('toggle');
+        $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');
+            }
         }
     };
     
@@ -662,7 +672,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         // If we are on mobile we need to collapse the menu on sidebar clicks
         // We use 968 px as the cutoff, which should match the value in glowingbear.css
         if (document.body.clientWidth < mobile_cutoff) {
-            $('#sidebar').collapse('toggle');
+            $scope.showSidebar = false;
         }
         return models.setActiveBuffer(bufferId, key);
     };