diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss
index b35043821da..9c7d1a03a03 100644
--- a/app/assets/stylesheets/sections/nav_sidebar.scss
+++ b/app/assets/stylesheets/sections/nav_sidebar.scss
@@ -126,7 +126,7 @@
 
     .nav-sidebar {
       margin-top: 20px;
-      position: absolute;
+      position: fixed;
       top: 45px;
       width: 52px;
 
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 98a3d2278a3..422966cdc55 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -17,3 +17,7 @@
       = yield
 
 = yield :embedded_scripts
+
+:coffeescript
+  $('.page-sidebar-collapsed .nav-sidebar a').tooltip placement: "right"
+