diff --git a/public/app/features/dashboard/partials/saveDashboardAs.html b/public/app/features/dashboard/partials/saveDashboardAs.html
index 8d04280465e..9af18591fde 100644
--- a/public/app/features/dashboard/partials/saveDashboardAs.html
+++ b/public/app/features/dashboard/partials/saveDashboardAs.html
@@ -14,7 +14,7 @@
 		<div class="text-center">
 			<h4>New title</h4>
 
-			<input type="text" class="input input-fluid" ng-model="clone.title">
+			<input type="text" class="input input-fluid" ng-model="clone.title" give-focus="clone" ng-keydown="keyDown($event)">
 			<br>
 			<br>
 
diff --git a/public/app/features/dashboard/saveDashboardAsCtrl.js b/public/app/features/dashboard/saveDashboardAsCtrl.js
index ec8327755f8..92c93b7e485 100644
--- a/public/app/features/dashboard/saveDashboardAsCtrl.js
+++ b/public/app/features/dashboard/saveDashboardAsCtrl.js
@@ -25,6 +25,12 @@ function (angular) {
       });
     }
 
+    $scope.keyDown = function (evt) {
+      if (evt.keyCode === 13) {
+        $scope.saveClone();
+      }
+    };
+
     $scope.saveClone = function() {
       saveDashboard({overwrite: false}).then(null, function(err) {
         if (err.data && err.data.status === "name-exists") {
diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less
index 7cd15d183f2..ce8f268bd6a 100644
--- a/public/css/less/submenu.less
+++ b/public/css/less/submenu.less
@@ -17,6 +17,7 @@
   label.cr1 {
     margin-left: 5px;
   }
+  padding: 8px 7px;
 }
 
 .submenu-item {