diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js
index f41dd007089..bbe22fc0b67 100644
--- a/src/app/features/dashboard/dashboardNavCtrl.js
+++ b/src/app/features/dashboard/dashboardNavCtrl.js
@@ -69,6 +69,10 @@ function (angular, _, moment, config, store) {
       $scope.appEvent('show-dash-search');
     };
 
+    $scope.dashboardTitleAction = function() {
+      $scope.appEvent('hide-dash-editor');
+    };
+
     $scope.saveDashboard = function() {
       var clone = angular.copy($scope.dashboard);
       $scope.db.saveDashboard(clone)
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 39264b9fbbe..9f8692447c1 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -18,7 +18,7 @@
 				<span class="fa fa-angle-right top-nav-breadcrumb-icon">
 				</span>
 
-				<a ng-click="asd()" class="top-nav-title pointer">
+				<a ng-click="dashboardTitleAction()" class="top-nav-title pointer">
 					{{dashboard.title}}
 				</a>
 			</div>
@@ -30,10 +30,10 @@
 					</a>
 				</li>
 				<li>
-					<a class="pointer" ng-click="shareDashboard()"><i class="fa fa-share-square-o"></i></a>
+					<a class="pointer" ng-click="shareDashboard()" bs-tooltip="'Share dashboard'" data-placement="bottom"><i class="fa fa-share-square-o"></i></a>
 				</li>
 				<li>
-					<a ng-click="saveDashboard()"><i class="fa fa-save"></i></a>
+					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
 					<a class="pointer" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html
index acb1bc578b2..4d7d372d22b 100644
--- a/src/app/partials/dasheditor.html
+++ b/src/app/partials/dasheditor.html
@@ -33,6 +33,7 @@
 						<select ng-model="dashboard.timezone" class='input-small' ng-options="f for f in ['browser','utc']"></select>
 					</div>
 					<editor-opt-bool text="Hide controls (CTRL+H)" model="dashboard.hideControls"></editor-opt-bool>
+					<editor-opt-bool text="Editable" model="dashboard.editable"></editor-opt-bool>
 				</div>
 			</div>
 			<div class="editor-row">