diff --git a/client/src/views/admin/layouts/bottom-panels-detail.js b/client/src/views/admin/layouts/bottom-panels-detail.js
index 2b9e98369c..9cb0362422 100644
--- a/client/src/views/admin/layouts/bottom-panels-detail.js
+++ b/client/src/views/admin/layouts/bottom-panels-detail.js
@@ -254,23 +254,35 @@ define('views/admin/layouts/bottom-panels-detail', ['views/admin/layouts/side-pa
         },
 
         onDrop: function () {
-            let tabBreakIndex = 0;
+            let tabBreakIndex = -1;
 
             let $tabBreak = null;
 
             this.$el.find('ul.enabled').children().each((i, li) => {
                 let $li = $(li);
-
                 let name = $li.attr('data-name');
 
                 if (this.isTabName(name)) {
-                    if (name === this.TAB_BREAK_KEY) {
-                        $tabBreak = $li.clone();
+                    if (name !== this.TAB_BREAK_KEY) {
+                        let itemIndex = parseInt(name.split('_')[2]);
 
-                        $li.attr('data-name', this.TAB_BREAK_KEY.slice(0, -3) + tabBreakIndex);
+                        if (itemIndex > tabBreakIndex) {
+                            tabBreakIndex = itemIndex;
+                        }
                     }
+                }
+            });
 
-                    tabBreakIndex++;
+            tabBreakIndex++;
+
+            this.$el.find('ul.enabled').children().each((i, li) => {
+                let $li = $(li);
+                let name = $li.attr('data-name');
+
+                if (this.isTabName(name) && name === this.TAB_BREAK_KEY) {
+                    $tabBreak = $li.clone();
+
+                    $li.attr('data-name', this.TAB_BREAK_KEY.slice(0, -3) + tabBreakIndex);
                 }
             });