diff --git a/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.html b/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.html
index 2b742230e..70701f908 100644
--- a/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.html
+++ b/priv/public/ui/app/components/directives/mn_storage_mode/mn_storage_mode.html
@@ -6,8 +6,7 @@
        value="forestdb"
        id="storage_mode_forestdb"
        ng-model="mnModel.storageMode"
-       ng-disabled="!mnIsEnterprise ||
-                    (mnServices && !mnServicesModel.index) ||
+       ng-disabled="(mnServices && !mnServicesModel.index) ||
                     (mnPermissions && !mnPermissions.cluster.indexes.write) ||
                     (mnInitial && mnInitial.storageMode === 'forestdb')">
     <label for="storage_mode_forestdb" class="checkbox">
diff --git a/priv/public/ui/app/css/cbui-components.css b/priv/public/ui/app/css/cbui-components.css
index 849b17f33..f4613d043 100644
--- a/priv/public/ui/app/css/cbui-components.css
+++ b/priv/public/ui/app/css/cbui-components.css
@@ -948,6 +948,9 @@ section.error {
   right: 0;
   bottom: 0;
 }
+.z-index-10001 {
+  z-index: 10001!important;
+}
 .spinner {
   position: absolute;
   z-index: 10;
diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/copy_dialog/mn_views_copy_dialog_controller.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/copy_dialog/mn_views_copy_dialog_controller.js
index 73864910b..743140a66 100644
--- a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/copy_dialog/mn_views_copy_dialog_controller.js
+++ b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/copy_dialog/mn_views_copy_dialog_controller.js
@@ -17,6 +17,7 @@
       var copy = prepareToCopy(url, currentDdoc);
       var promise = mnViewsListService.getDdoc(url).then(function (presentDdoc) {
         return $uibModal.open({
+          windowClass: "z-index-10001",
           templateUrl: 'app/mn_admin/mn_indexes/mn_views/confirm_dialogs/mn_views_confirm_override_dialog.html'
         }).result.then(copy);
       }, copy);
diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/create_dialog/mn_views_create_dialog_controller.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/create_dialog/mn_views_create_dialog_controller.js
index ca85b42c4..87ff51389 100644
--- a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/create_dialog/mn_views_create_dialog_controller.js
+++ b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/create_dialog/mn_views_create_dialog_controller.js
@@ -56,6 +56,7 @@
         }
         if (_.keys(views).length >= 10) {
           return $uibModal.open({
+            windowClass: "z-index-10001",
             templateUrl: 'app/mn_admin/mn_indexes/mn_views/confirm_dialogs/mn_views_confirm_limit_dialog.html'
           }).result.then(function () {
             return createDdoc(presentDdoc);
diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/list/mn_views_list_controller.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/list/mn_views_list_controller.js
index d4ab611b5..f2fc9ea16 100644
--- a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/list/mn_views_list_controller.js
+++ b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/list/mn_views_list_controller.js
@@ -118,13 +118,15 @@
     function publishDdoc(ddoc) {
       var url = mnViewsListService.getDdocUrl($state.params.bucket, "_design/" + mnViewsListService.cutOffDesignPrefix(ddoc.meta.id));
       var publish = prepareToPublish(url, ddoc);
-      mnPromiseHelper(vm, mnViewsListService.getDdoc(url))
-        .getPromise()
-        .then(function (presentDdoc) {
-          $uibModal.open({
-            templateUrl: 'app/mn_admin/mn_indexes/mn_views/confirm_dialogs/mn_views_confirm_override_dialog.html'
-          }).result.then(publish);
-        }, publish);
+      var promise = mnViewsListService.getDdoc(url).then(function () {
+        return $uibModal.open({
+          windowClass: "z-index-10001",
+          templateUrl: 'app/mn_admin/mn_indexes/mn_views/confirm_dialogs/mn_views_confirm_override_dialog.html'
+        }).result.then(publish);
+      }, publish);
+
+      mnPromiseHelper(vm, promise)
+        .showGlobalSpinner();
     }
     function copyToDev(ddoc) {
       $uibModal.open({