diff --git a/pkg/api/index.go b/pkg/api/index.go
index 74b168e53e9..094511df1ea 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -52,12 +52,15 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		Text: "Dashboards",
 		Icon: "fa fa-fw fa-th-large",
 		Url:  setting.AppSubUrl + "/",
-		Children: []*dtos.NavLink{
-			{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
-			{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
-		},
+		// Children: []*dtos.NavLink{
+		// 	{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"},
+		// 	{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"},
+		// },
 	})
 
+	data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{Text: "Playlists", Icon: "fa fa-fw fa-list", Url: setting.AppSubUrl + "/playlists"})
+	data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{Text: "Snapshots", Icon: "fa-fw icon-gf icon-gf-snapshot", Url: setting.AppSubUrl + "/dashboard/snapshots"})
+
 	if c.OrgRole == m.ROLE_ADMIN {
 		data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
 			Text: "Data Sources",
diff --git a/public/app/core/components/sidemenu/sidemenu.html b/public/app/core/components/sidemenu/sidemenu.html
index dd3b71e54b4..7fcd41a2824 100644
--- a/public/app/core/components/sidemenu/sidemenu.html
+++ b/public/app/core/components/sidemenu/sidemenu.html
@@ -1,7 +1,7 @@
 <ul class="sidemenu sidemenu-main">
 
 	<li class="sidemenu-org-section" ng-if="ctrl.isSignedIn">
-		<div class="sidemenu-org">
+		<div class="sidemenu-org" data-toggle="dropdown" ng-click="ctrl.openUserDropdown()">
 			<div class="sidemenu-org-avatar">
 				<img ng-src="{{ctrl.user.gravatarUrl}}">
 			</div>
@@ -43,7 +43,6 @@
 				<img ng-src="{{item.img}}" ng-show="item.img">
 			</span>
 			<span class="sidemenu-item-text">{{item.text}}</span>
-			<i class="fa fa-caret-right small" ng-show="item.children"></i>
 		</a>
 		<ul class="dropdown-menu" role="menu" ng-if="item.children">
 			<li ng-repeat="child in item.children">
diff --git a/public/app/core/components/sidemenu/sidemenu.ts b/public/app/core/components/sidemenu/sidemenu.ts
index 275b0e782a4..0394d143ab9 100644
--- a/public/app/core/components/sidemenu/sidemenu.ts
+++ b/public/app/core/components/sidemenu/sidemenu.ts
@@ -38,7 +38,6 @@ export class SideMenuCtrl {
 
  setupMainNav() {
    this.mainLinks = config.bootData.mainNavLinks;
-   this.openUserDropdown();
  }
 
  openUserDropdown() {
diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less
index 4349bd4a0c6..84d5be33890 100644
--- a/public/less/sidemenu.less
+++ b/public/less/sidemenu.less
@@ -76,13 +76,6 @@
       color: @linkColor;
     }
   }
-
-  li:hover {
-    position: relative;
-    .dropdown-menu {
-      display: block;
-    }
-  }
 }
 
 .sidemenu-main-link {