diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 298dfc2966c..708ba047d2b 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -86,7 +86,7 @@ export class DashboardSrv {
 
   save(clone, options) {
     options = options || {};
-    options.folderId = this.dash.meta.folderId;
+    options.folderId = options.folderId || this.dash.meta.folderId;
 
     return this.backendSrv
       .saveDashboard(clone, options)
diff --git a/public/app/features/dashboard/folder_picker/folder_picker.html b/public/app/features/dashboard/folder_picker/folder_picker.html
index 8722a19a5f8..17b7512d35d 100644
--- a/public/app/features/dashboard/folder_picker/folder_picker.html
+++ b/public/app/features/dashboard/folder_picker/folder_picker.html
@@ -9,29 +9,21 @@
     </div>
     <input type="text"
       class="gf-form-input max-width-10"
-      ng-show="ctrl.createNewFolder"
+      ng-if="ctrl.createNewFolder"
       give-focus="ctrl.createNewFolder"
       ng-model="ctrl.newFolderName"
       ng-model-options="{ debounce: 400 }"
-      ng-class="{'validation-error': !ctrl.isNewFolderNameValid()}"
       ng-change="ctrl.newFolderNameChanged()" />
   </div>
-  <div class="gf-form" ng-show="ctrl.createNewFolder">
-    <label class="gf-form-label text-success"
-      ng-show="ctrl.newFolderNameTouched && !ctrl.hasValidationError">
-      <i class="fa fa-check"></i>
-    </label>
-  </div>
-  <div class="gf-form" ng-show="ctrl.createNewFolder">
-    <button class="gf-form-label"
+  <div class="gf-form" ng-if="ctrl.createNewFolder">
+    <button class="btn btn-inverse"
       ng-click="ctrl.createFolder($event)"
       ng-disabled="!ctrl.newFolderNameTouched || ctrl.hasValidationError">
       <i class="fa fa-fw fa-save"></i>&nbsp;Create
     </button>
   </div>
-  <div class="gf-form" ng-show="ctrl.createNewFolder">
-    <button class="gf-form-label"
-      ng-click="ctrl.cancelCreateFolder($event)">
+  <div class="gf-form" ng-if="ctrl.createNewFolder">
+    <button class="btn btn-inverse" ng-click="ctrl.cancelCreateFolder($event)">
       Cancel
   </button>
   </div>
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 236b1f07b56..04b029cbb4c 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -13,7 +13,7 @@ const template = `
 		</a>
 	</div>
 
-	<form name="ctrl.saveForm" ng-submit="ctrl.save()" class="modal-content" novalidate>
+	<form name="ctrl.saveForm" class="modal-content" novalidate>
 		<div class="p-t-2">
 			<div class="gf-form">
 				<label class="gf-form-label width-7">New name</label>
@@ -22,8 +22,6 @@ const template = `
       <div class="gf-form">
         <folder-picker initial-folder-id="ctrl.folderId"
                        on-change="ctrl.onFolderChange($folder)"
-                       enter-folder-creation="ctrl.onEnterFolderCreation()"
-                       exit-folder-creation="ctrl.onExitFolderCreation()"
                        enable-create-new="true"
                        label-class="width-7">
         </folder-picker>
@@ -31,7 +29,7 @@ const template = `
 		</div>
 
 		<div class="gf-form-button-row text-center">
-			<button type="submit" class="btn btn-success" ng-disabled="ctrl.saveForm.$invalid || !ctrl.isValidFolderSelection">Save</button>
+			<button type="submit" class="btn btn-success" ng-click="ctrl.save()">Save</button>
 			<a class="btn-text" ng-click="ctrl.dismiss();">Cancel</a>
 		</div>
 	</form>
@@ -41,7 +39,6 @@ const template = `
 export class SaveDashboardAsModalCtrl {
   clone: any;
   folderId: any;
-  isValidFolderSelection = true;
   dismiss: () => void;
 
   /** @ngInject */
@@ -69,25 +66,17 @@ export class SaveDashboardAsModalCtrl {
   }
 
   save() {
-    return this.dashboardSrv.save(this.clone).then(this.dismiss);
-  }
-
-  onEnterFolderCreation() {
-    this.isValidFolderSelection = false;
-  }
-
-  onExitFolderCreation() {
-    this.isValidFolderSelection = true;
+    return this.dashboardSrv.save(this.clone, { folderId: this.folderId }).then(this.dismiss);
   }
 
   keyDown(evt) {
-    if (this.isValidFolderSelection && evt.keyCode === 13) {
+    if (evt.keyCode === 13) {
       this.save();
     }
   }
 
   onFolderChange(folder) {
-    this.clone.folderId = folder.id;
+    this.folderId = folder.id;
   }
 }