diff --git a/public/app/features/dashboard/dashnav/dashnav.ts b/public/app/features/dashboard/dashnav/dashnav.ts
index 2f1a2936419..17a5bc61696 100644
--- a/public/app/features/dashboard/dashnav/dashnav.ts
+++ b/public/app/features/dashboard/dashnav/dashnav.ts
@@ -35,8 +35,7 @@ export class DashNavCtrl {
     let search = this.$location.search();
     if (search.editview) {
       delete search.editview;
-    }
-    if (search.fullscreen) {
+    } else if (search.fullscreen) {
       delete search.fullscreen;
       delete search.edit;
     }
diff --git a/public/app/features/dashboard/settings/settings.html b/public/app/features/dashboard/settings/settings.html
index 18dd055ef05..951288347d2 100644
--- a/public/app/features/dashboard/settings/settings.html
+++ b/public/app/features/dashboard/settings/settings.html
@@ -10,11 +10,13 @@
 	</a>
 
 	<div class="dashboard-settings__aside-actions">
+    <button class="btn btn-success" ng-click="ctrl.saveDashboard()" ng-show="ctrl.canSave">
+			<i class="fa fa-save"></i> Save
+		</button>
 		<button class="btn btn-inverse" ng-click="ctrl.openSaveAsModal()" ng-show="ctrl.canSaveAs">
 			<i class="fa fa-copy"></i>
 			Save As...
 		</button>
-
 		<button class="btn btn-danger" ng-click="ctrl.deleteDashboard()" ng-show="ctrl.canDelete">
 			<i class="fa fa-trash"></i>
 			Delete
diff --git a/public/app/features/dashboard/settings/settings.ts b/public/app/features/dashboard/settings/settings.ts
index 2ac718f9f22..4f678713ffc 100755
--- a/public/app/features/dashboard/settings/settings.ts
+++ b/public/app/features/dashboard/settings/settings.ts
@@ -11,6 +11,7 @@ export class SettingsCtrl {
   json: string;
   alertCount: number;
   canSaveAs: boolean;
+  canSave: boolean;
   canDelete: boolean;
   sections: any[];
 
@@ -26,6 +27,7 @@ export class SettingsCtrl {
     });
 
     this.canSaveAs = contextSrv.isEditor;
+    this.canSave = this.dashboard.meta.canSave;
     this.canDelete = this.dashboard.meta.canSave;
 
     this.buildSectionList();
@@ -117,6 +119,10 @@ export class SettingsCtrl {
     this.dashboardSrv.showSaveAsModal();
   }
 
+  saveDashboard() {
+    this.dashboardSrv.saveDashboard();
+  }
+
   hideSettings() {
     var urlParams = this.$location.search();
     delete urlParams.editview;
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 7cf03319f1b..1a453b15069 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -25,6 +25,7 @@
 
   .navbar-button--add-panel,
   .navbar-button--star,
+  .navbar-button--save,
   .navbar-button--share,
   .navbar-button--settings,
   .navbar-page-btn .fa-caret-down,
@@ -44,8 +45,6 @@
 
   .navbar-button--add-panel,
   .navbar-button--star,
-  .navbar-button--save,
-  .navbar-button--settings,
   .navbar-page-btn .fa-caret-down {
     display: none;
   }
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index af9a02caa2a..871db4dfc2d 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -2,7 +2,6 @@
   padding: $dashboard-padding;
   width: 100%;
   min-height: 100%;
-  // background: $dashboard-gradient;
 }
 
 .template-variable {
@@ -159,7 +158,7 @@ div.flot-text {
     display: block;
     @include panel-corner-color(lighten($panel-bg, 4%));
     .fa:before {
-      content: "\f129";
+      content: '\f129';
     }
   }
 
@@ -170,7 +169,7 @@ div.flot-text {
       left: -5px;
     }
     .fa:before {
-      content: "\f08e";
+      content: '\f08e';
     }
   }
 
@@ -179,7 +178,7 @@ div.flot-text {
     color: $text-color;
     @include panel-corner-color($popover-error-bg);
     .fa:before {
-      content: "\f12a";
+      content: '\f12a';
     }
   }
 }