diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
index 62c200bb96..4b83a9417e 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js
@@ -107,7 +107,6 @@
           data: JSON.stringify(postParameter),
           contentType: "application/json",
           processData: false,
-          async: true,
           success: function (data, textStatus, xhr) {
             if (xhr.getResponseHeader('x-arango-async-id')) {
               window.arangoHelper.addAardvarkJob({
@@ -129,13 +128,28 @@
     },
 
     deleteIndex: function (id, callback) {
+
+      var self = this;
+
       $.ajax({
           cache: false,
           type: 'DELETE',
           url: "/_api/index/"+ this.get("name") +"/"+encodeURIComponent(id),
-          async: true,
-          success: function () {
-            callback(false);
+          headers: {
+            'x-arango-async': 'store' 
+          },
+          success: function (data, textStatus, xhr) {
+            if (xhr.getResponseHeader('x-arango-async-id')) {
+              window.arangoHelper.addAardvarkJob({
+                id: xhr.getResponseHeader('x-arango-async-id'),
+                type: 'index',
+                collection: self.get("id")
+              });
+              callback(false, data);
+            }
+            else {
+              callback(true, data);
+            }
           },
           error: function (data) {
             callback(true, data);
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js
index 598ce69cab..b2f3cd57fe 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js
@@ -591,6 +591,15 @@
 
     },
 
+    refreshCollectionsView: function() {
+      var self = this;
+      window.App.arangoCollectionsStore.fetch({
+        success: function () {
+          self.collectionsView.checkLockedCollections();
+        }
+      });
+    },
+
     deleteIndex: function () {
       var callback = function(error) {
         if (error) {
@@ -599,13 +608,21 @@
             '<span class="deleteIndex icon_arangodb_roundminus"' + 
             ' data-original-title="Delete index" title="Delete index"></span>'
           );
+          this.model.set("locked", false);
+          this.refreshCollectionsView();
         }
-        else {
+        else if (!error && error !== undefined) {
           $("tr th:contains('"+ this.lastId+"')").parent().remove();
+          this.model.set("locked", false);
+          this.refreshCollectionsView();
         }
       }.bind(this);
 
+      this.model.set("locked", true);
       this.model.deleteIndex(this.lastId, callback);
+
+      this.refreshCollectionsView();
+
       $("tr th:contains('"+ this.lastId+"')").parent().children().last().html(
         '<i class="fa fa-circle-o-notch fa-spin"></i>'
       );
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
index 715940034d..5680981889 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryView.js
@@ -907,6 +907,8 @@
               if (typeof callback === "function") {
                 callback();
               }
+              $.noty.clearQueue();
+              $.noty.closeAll();
             },
             error: function (data) {
               window.progressView.hide();
@@ -1098,7 +1100,8 @@
               if (xhr.getResponseHeader('x-arango-async-id')) {
                 self.queryCallbackFunction(xhr.getResponseHeader('x-arango-async-id'), callback);
               }
-
+              $.noty.clearQueue();
+              $.noty.closeAll();
             },
             error: function (data) {
               self.switchTab("result-switch");
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentsView.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentsView.scss
index a83449317a..acb9e5af4b 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentsView.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_documentsView.scss
@@ -47,6 +47,10 @@
     margin-left: 10px;
   }
 
+  .fa {
+    margin-left: 13px;
+  }
+
 }
 
 .contentIn {