diff --git a/public/app/features/dashboard/dashboard_srv.ts b/public/app/features/dashboard/dashboard_srv.ts
index 9d622f4bbc7..1269ed571dc 100644
--- a/public/app/features/dashboard/dashboard_srv.ts
+++ b/public/app/features/dashboard/dashboard_srv.ts
@@ -117,6 +117,9 @@ export class DashboardSrv {
     newScope.clone = this.dash.getSaveModelClone();
     newScope.clone.editable = true;
     newScope.clone.hideControls = false;
+    newScope.clone.meta = {};
+    newScope.clone.meta.parentId = this.dash.meta.parentId;
+    newScope.clone.meta.isFolder = this.dash.meta.isFolder;
 
     this.$rootScope.appEvent('show-modal', {
       templateHtml: '<save-dashboard-as-modal dismiss="dismiss()"></save-dashboard-as-modal>',
diff --git a/public/app/features/dashboard/folder_picker/picker.html b/public/app/features/dashboard/folder_picker/picker.html
index 0659fcd5700..09947f32751 100644
--- a/public/app/features/dashboard/folder_picker/picker.html
+++ b/public/app/features/dashboard/folder_picker/picker.html
@@ -2,7 +2,7 @@
   <label class="gf-form-label width-7">Folder</label>
   <div class="dropdown">
     <metric-segment segment="ctrl.selectedFolderSegment"
-                    get-options="ctrl.getOptions()"
-                    on-change="ctrl.folderChanged()"></metric-segment>
+      get-options="ctrl.getOptions()"
+      on-change="ctrl.folderChanged()"></metric-segment>
   </div>
 </div>
diff --git a/public/app/features/dashboard/folder_picker/picker.ts b/public/app/features/dashboard/folder_picker/picker.ts
index 41892c81b31..92ded3a5256 100644
--- a/public/app/features/dashboard/folder_picker/picker.ts
+++ b/public/app/features/dashboard/folder_picker/picker.ts
@@ -42,7 +42,9 @@ export class FolderPickerCtrl {
 
   folderChanged() {
     const selected = _.find(this.folders, {title: this.selectedFolderSegment.value});
-    this.dashboard.parentId = selected.id;
+    if (selected) {
+      this.dashboard.parentId = selected.id;
+    }
   }
 }
 
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index d3df6095e3f..b2e9b6bfd76 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -45,7 +45,7 @@
 				</div>
 			</div>
 
-      <folder-picker ng-hide="dashboardMeta.isFolder" dashboard="dashboard"></folder-picker>
+      <folder-picker ng-if="!dashboardMeta.isFolder" dashboard="dashboard"></folder-picker>
 		</div>
 
     <div class="section">
diff --git a/public/app/features/dashboard/save_as_modal.ts b/public/app/features/dashboard/save_as_modal.ts
index 0be82755e41..5c821eb1e2b 100644
--- a/public/app/features/dashboard/save_as_modal.ts
+++ b/public/app/features/dashboard/save_as_modal.ts
@@ -3,7 +3,7 @@
 import coreModule from 'app/core/core_module';
 
 const  template = `
-<div class="modal-body">
+<div class="modal-body modal-body--with-overflow">
 	<div class="modal-header">
 		<h2 class="modal-header-title">
 			<i class="fa fa-copy"></i>
@@ -21,6 +21,9 @@ const  template = `
 				<label class="gf-form-label">New name</label>
 				<input type="text" class="gf-form-input" ng-model="ctrl.clone.title" give-focus="true" required>
 			</div>
+      <div class="gf-form">
+        <folder-picker ng-if="!clone.meta.isFolder" selected-folder="clone.meta.parentId" on-change="onFolderChange"></folder-picker>
+      </div>
 		</div>
 
 		<div class="gf-form-button-row text-center">
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 78293ef801a..4f388a88d96 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -87,6 +87,10 @@
   max-width: 500px;
 }
 
+.modal-body--with-overflow {
+  overflow-y: visible;
+}
+
 .confirm-modal {
   max-width: 500px;