diff --git a/src/filemanager.html b/src/filemanager.html
index ba317e857..f74f365e5 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -57,16 +57,13 @@
   <div class="modal fade" id="entryRemoveModal" tabindex="-1" role="dialog">
     <div class="modal-dialog">
       <div class="modal-content">
-        <div class="modal-header">
-          <h4 class="modal-title">Delete {{ entryRemove.entry.fileName }}</h4>
-        </div>
         <div class="modal-body">
           <p class="text-bold text-danger" ng-show="entryRemove.error">{{ entryRemove.error }}</p>
-          <p ng-hide="entryRemove.error">Really delete {{ entryRemove.entry.fileName }}</p>
+          <h4 ng-hide="entryRemove.error">Really delete {{ entryRemove.entry.fileName }}?</h4>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <button type="button" class="btn btn-danger" ng-click="entryRemove.submit()" ng-hide="entryRemove.error" ng-disabled="entryRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="entryRemove.busy"></i> Delete</button>
+          <button type="button" class="btn btn-default" data-dismiss="modal">No</button>
+          <button type="button" class="btn btn-danger" ng-click="entryRemove.submit()" ng-hide="entryRemove.error" ng-disabled="entryRemove.busy"><i class="fa fa-circle-notch fa-spin" ng-show="entryRemove.busy"></i> Yes</button>
         </div>
       </div>
     </div>
@@ -77,15 +74,14 @@
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">New Directory</h4>
+          <h4 class="modal-title">New Folder</h4>
         </div>
         <div class="modal-body">
           <form role="form" name="newDirectoryForm" ng-submit="newDirectory.submit()" autocomplete="off">
             <fieldset>
-              <div class="form-group" ng-class="{ 'has-error': (newDirectoryForm.directoryName.$dirty && newDirectoryForm.directoryName.$invalid) }">
-                <label class="control-label">Directory Name</label>
+              <div class="form-group" ng-class="{ 'has-error': newDirectory.error || (newDirectoryForm.directoryName.$dirty && newDirectoryForm.directoryName.$invalid) }">
+                <input type="text" class="form-control" id="inputDirectoryName" name="directoryName" ng-model="newDirectory.name" required autofocus>
                 <div class="control-label" ng-show="newDirectory.error">{{ newDirectory.error }}</div>
-                <input type="text" class="form-control" id="inputDirectoryName" name="directoryName" ng-model="newDirectory.name" required>
               </div>
               <input class="ng-hide" type="submit" ng-disabled="newDirectoryForm.$invalid || newDirectory.busy"/>
             </fieldset>
@@ -93,7 +89,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <button type="button" class="btn btn-danger" ng-click="newDirectory.submit()" ng-hide="newDirectory.error" ng-disabled="newDirectory.busy"><i class="fa fa-circle-notch fa-spin" ng-show="newDirectory.busy"></i> Create</button>
+          <button type="button" class="btn btn-danger" ng-click="newDirectory.submit()" ng-disabled="newDirectory.busy"><i class="fa fa-circle-notch fa-spin" ng-show="newDirectory.busy"></i> Create</button>
         </div>
       </div>
     </div>
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 520b2ec09..103383a3a 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -146,16 +146,21 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
             $scope.newDirectory.name = '';
             $scope.newDirectory.busy = false;
 
+            $scope.newDirectoryForm.$setUntouched();
+            $scope.newDirectoryForm.$setPristine();
+
             $('#newDirectoryModal').modal('show');
         },
 
         submit: function () {
             $scope.newDirectory.busy = true;
+            $scope.newDirectory.error = null;
 
             var filePath = sanitize($scope.cwd + '/' + $scope.newDirectory.name);
 
             Client.filesCreateDirectory($scope.appId, filePath, function (error, result) {
                 $scope.newDirectory.busy = false;
+                if (error && error.statusCode === 409) return $scope.newDirectory.error = 'Already exists';
                 if (error) return Client.error(error);
 
                 console.log('create direcotory', result);
@@ -277,4 +282,11 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
     }
 
     init();
+
+    // setup all the dialog focus handling
+    ['newDirectoryModal'].forEach(function (id) {
+        $('#' + id).on('shown.bs.modal', function () {
+            $(this).find("[autofocus]:first").focus();
+        });
+    });
 }]);