diff --git a/app/assets/stylesheets/app/_notes.scss b/app/assets/stylesheets/app/_notes.scss
index 2252ba378..923e7cf57 100644
--- a/app/assets/stylesheets/app/_notes.scss
+++ b/app/assets/stylesheets/app/_notes.scss
@@ -1,6 +1,5 @@
 .notes {
   width: 25%;
-  max-width: 25%;
   border-left: 1px solid #dddddd;
   border-right: 1px solid #dddddd;
 
diff --git a/app/assets/stylesheets/app/_tags.scss b/app/assets/stylesheets/app/_tags.scss
index e6f48d7cc..7d3ce9e34 100644
--- a/app/assets/stylesheets/app/_tags.scss
+++ b/app/assets/stylesheets/app/_tags.scss
@@ -1,10 +1,11 @@
-
 .tags {
     width: 15%;
 
+    $tags-title-bar-height: 55px;
+
    .tags-title-bar {
     color: black;
-    height: 55px !important;
+    height: $tags-title-bar-height !important;
     padding-left: 12px !important;
     padding-right: 12px !important;
     font-size: 12px !important;
@@ -25,6 +26,10 @@
     }
   }
 
+  .scrollable {
+    height: calc(100vh - (#{$tags-title-bar-height} + #{$header-height}));
+  }
+
   .tag {
     height: 30px;
     padding: 5px 12px;
diff --git a/app/assets/templates/frontend/tags.html.haml b/app/assets/templates/frontend/tags.html.haml
index abdc92dc5..7f28cfa24 100644
--- a/app/assets/templates/frontend/tags.html.haml
+++ b/app/assets/templates/frontend/tags.html.haml
@@ -4,14 +4,15 @@
       .title Tags
       .add-button.tag-add-button{"ng-click" => "ctrl.clickedAddNewTag()"} +
       {{ctrl.test}}
-    .tag{"ng-if" => "ctrl.allTag", "ng-click" => "ctrl.selectTag(ctrl.allTag)", "ng-class" => "{'selected' : ctrl.selectedTag == ctrl.allTag}"}
-      %input.title{"ng-disabled" => "true", "ng-model" => "ctrl.allTag.title"}
-      .count {{ctrl.noteCount(ctrl.allTag)}}
 
-    .tag{"ng-repeat" => "tag in ctrl.tags", "ng-click" => "ctrl.selectTag(tag)", "ng-class" => "{'selected' : ctrl.selectedTag == tag}",
-    "droppable" => true, "drop" => "ctrl.handleDrop", "tag" => "tag"}
+    .scrollable
+      .tag{"ng-if" => "ctrl.allTag", "ng-click" => "ctrl.selectTag(ctrl.allTag)", "ng-class" => "{'selected' : ctrl.selectedTag == ctrl.allTag}"}
+        %input.title{"ng-disabled" => "true", "ng-model" => "ctrl.allTag.title"}
+        .count {{ctrl.noteCount(ctrl.allTag)}}
+      .tag{"ng-repeat" => "tag in ctrl.tags", "ng-click" => "ctrl.selectTag(tag)", "ng-class" => "{'selected' : ctrl.selectedTag == tag}",
+      "droppable" => true, "drop" => "ctrl.handleDrop", "tag" => "tag"}
 
-      %input.title{"ng-disabled" => "tag != ctrl.selectedTag", "ng-model" => "tag.title",
-      "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTag($event, tag)", "mb-autofocus" => "true", "should-focus" => "ctrl.newTag",
-      "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-focus" => "ctrl.onTagTitleFocus(tag)", "ng-blur" => "ctrl.saveTag($event, tag)"}
-      .count {{ctrl.noteCount(tag)}}
+        %input.title{"ng-disabled" => "tag != ctrl.selectedTag", "ng-model" => "tag.title",
+        "ng-keyup" => "$event.keyCode == 13 && ctrl.saveTag($event, tag)", "mb-autofocus" => "true", "should-focus" => "ctrl.newTag",
+        "ng-change" => "ctrl.tagTitleDidChange(tag)", "ng-focus" => "ctrl.onTagTitleFocus(tag)", "ng-blur" => "ctrl.saveTag($event, tag)"}
+        .count {{ctrl.noteCount(tag)}}