diff --git a/html/admin/js/templates/documentsView.ejs b/html/admin/js/templates/documentsView.ejs
index 6a913b81fe..1b4505ac34 100644
--- a/html/admin/js/templates/documentsView.ejs
+++ b/html/admin/js/templates/documentsView.ejs
@@ -35,7 +35,7 @@
     <p>Theres no way back…</p>
   </div>
   <div class="modal-footer">
-    <button id="confirmDeleteBtn" class="btn btn-danger" style="float:right">Delete</button>
+    <button id="confirmDeleteBtn" class="btn btn-danger" style="float:right" disabled="true">Delete</button>
   </div>
 </div>
 
diff --git a/html/admin/js/views/documentsView.js b/html/admin/js/views/documentsView.js
index a806c9f9ce..c78aee67c9 100644
--- a/html/admin/js/views/documentsView.js
+++ b/html/admin/js/views/documentsView.js
@@ -26,7 +26,16 @@ var documentsView = Backbone.View.extend({
     "click #documents_next"      : "nextDocuments",
     "click #confirmDeleteBtn"    : "confirmDelete",
     "keyup .modal-body"          : "listenKey",
-    "click .key"                 : "nop"
+    "click .key"                 : "nop",
+    "keyup"                      : "returnPressedHandler"
+  },
+
+  returnPressedHandler: function(event) {
+    if (event.keyCode === 13) {
+      if (!!$("#confirmDeleteBtn").attr("disabled") === false) {
+        this.confirmDelete();
+      }
+    } 
   },
 
   nop: function(event) {
@@ -125,11 +134,12 @@ var documentsView = Backbone.View.extend({
     var thiselement = a.currentTarget.parentElement;
     this.idelement = $(thiselement).prev().prev();
     this.alreadyClicked = true;
-
+    $("#confirmDeleteBtn").attr("disabled", false);
     $('#docDeleteModal').modal('show');
 
   },
   confirmDelete: function () {
+    $("#confirmDeleteBtn").attr("disabled", true);	
     this.reallyDelete();
   },
   reallyDelete: function () {
@@ -148,7 +158,7 @@ var documentsView = Backbone.View.extend({
         deleted = true;
       }
       else if (result === false) {
-        arangoHelper.arangoError('Document error');
+        arangoHelper.arangoError('Could not delete document');
       }
     }
     else if (this.type === 'edge') {