diff --git a/css/app.css b/css/app.css
index 1a967730..79444fc0 100644
--- a/css/app.css
+++ b/css/app.css
@@ -890,7 +890,8 @@
     opacity: 1 !important;
     z-index: 140; }
     .nav-trashbin a.active {
-      #border-left: 3px solid #0082c9; }
+      #border-left: 3px solid #0082c9;
+    }
     .nav-trashbin a .fa {
       margin-right: 15px; }
 
diff --git a/js/app/controllers/menu.js b/js/app/controllers/menu.js
index bb42f59e..aa7ee543 100644
--- a/js/app/controllers/menu.js
+++ b/js/app/controllers/menu.js
@@ -110,6 +110,18 @@
                     }
 				};
 
+                $scope.tagCollapsibleClicked = function () {
+                    if ($scope.tagCollapsibleOpen === true)
+                        $scope.tagCollapsibleOpen = false;
+                    else
+                        $scope.tagCollapsibleOpen = true;
+                };
+
+                $scope.tagCollapsibleState = function () {
+                    return $scope.tagCollapsibleOpen !== false;
+
+                };
+
 				$rootScope.$on('credentials_loaded', function () {
 					$rootScope.$broadcast('selected_tags_updated', $scope.selectedTags);
 				});
diff --git a/sass/menu.scss b/sass/menu.scss
index 4896c5cb..1ff9d7e3 100644
--- a/sass/menu.scss
+++ b/sass/menu.scss
@@ -63,8 +63,19 @@
   display: none;
 }
 
+//Overrides transparent entry bullet on hover from server
+#app-navigation .collapsible:hover .app-navigation-entry-bullet{
+  background: var(--color-primary) !important;
+}
+
 #app-navigation {
+
   li{
+    .app-navigation-entry-bullet-color {
+      background-color: var(--color-primary);
+    }
+
+
     .highlight-selected{
         background-color: var(--color-primary);
     }
diff --git a/sass/partials/tabs.scss b/sass/partials/tabs.scss
index c181c517..d4801c25 100644
--- a/sass/partials/tabs.scss
+++ b/sass/partials/tabs.scss
@@ -68,10 +68,6 @@
 
 }
 
-.app-navigation-entry-bullet-color {
-  background-color: var(--color-primary);
-}
-
 .tab_container {
   border: 1px solid #eee;
   border-top-color: #0082c9;
diff --git a/templates/main.php b/templates/main.php
index 20c0cc67..88beba5d 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -126,17 +126,27 @@ style('passman', 'app');
 
 	<div id="app-navigation" ng-show="selectedVault" ng-controller="MenuCtrl">
 		<ul class="with-icon">
-			<li class="taginput">
+			<!--<li class="taginput">
 				<a class="taginput">
 					<tags-input ng-model="selectedTags" replace-spaces-with-dashes="false">
 						<auto-complete source="getTags($query)" min-length="0"></auto-complete>
 					</tags-input>
 				</a>
-			</li>
-			<li ng-repeat="tag in available_tags | orderBy:'text'">
-                <div ng-if="tagSelected(tag)" class="app-navigation-entry-bullet app-navigation-entry-bullet-color"></div>
-				<a class="icon-tag svg" ng-click="tagClicked(tag)">{{tag.text}}</a>
-			</li>
+			</li>-->
+
+            <li class="collapsible open" ng-class="{'open':tagCollapsibleState()}">
+                <button class="collapse" ng-click="tagCollapsibleClicked()"></button>
+
+                <a href="" class="icon-tag" ng-click="tagCollapsibleClicked()">{{ 'Tags' | translate }}</a>
+                <ul>
+                    <li ng-repeat="tag in available_tags | orderBy:'text'">
+                        <div ng-if="tagSelected(tag)" class="app-navigation-entry-bullet app-navigation-entry-bullet-color"></div>
+                        <a class="icon-tag svg" ng-click="tagClicked(tag)">{{tag.text}}</a>
+                    </li>
+                </ul>
+            </li>
+
+
 			<li data-id="trashbin" class="nav-trashbin pinned first-pinned">
 				<a ng-click="toggleDeleteTime()" ng-class="{'active': delete_time > 0}" class="icon-delete svg">
 					{{ 'deleted.credentials' | translate }}