diff --git a/packages/nc-gui/components/ProjectTreeView.vue b/packages/nc-gui/components/ProjectTreeView.vue
index 6d9c2a82b1..c4aecfbcce 100644
--- a/packages/nc-gui/components/ProjectTreeView.vue
+++ b/packages/nc-gui/components/ProjectTreeView.vue
@@ -201,12 +201,11 @@
                   </template>
 
                   <v-list-item-group :value="selectedItem">
-                    <draggable
-                      v-model=" item.children"
+                    <component
+                      :is="_isUIAllowed('treeview-drag-n-drop') ? 'draggable' : 'div'"
+                      v-model="item.children"
                       draggable="div"
                       v-bind="dragOptions"
-                      @start="drag=true"
-                      @end="drag=false"
                       @change="onMove($event, item.children)"
                     >
                       <transition-group type="transition" :name="!drag ? 'flip-list' : null">
@@ -227,6 +226,7 @@
                           @contextmenu.prevent.stop="showCTXMenu($event, child, false, true)"
                         >
                           <v-icon
+                            v-if="_isUIAllowed('treeview-drag-n-drop')"
                             small
                             :class="`nc-child-draggable-icon nc-child-draggable-icon-${child.name}`"
                           >
@@ -319,7 +319,7 @@
                           </template>
                         </v-list-item>
                       </transition-group>
-                    </draggable>
+                    </component>
                   </v-list-item-group>
                 </v-list-group>
                 <v-list-item
diff --git a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
index 56b2a84726..a8b93fedf4 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/spreadsheetNavDrawer.vue
@@ -17,11 +17,10 @@
             </v-list-item>
             <v-list-item-group v-model="selectedViewIdLocal" mandatory color="primary">
               <draggable
+                :is="_isUIAllowed('viewlist-drag-n-drop') ? 'draggable' : 'div'"
                 v-model="viewsList"
                 draggable="div"
                 v-bind="dragOptions"
-                @start="drag=true"
-                @end="drag=false"
                 @change="onMove($event)"
               >
                 <transition-group type="transition" :name="!drag ? 'flip-list' : null">
@@ -36,8 +35,9 @@
                     @click="$emit('generateNewViewKey')"
                   >
                     <v-icon
+                      v-if="_isUIAllowed('viewlist-drag-n-drop')"
                       small
-                      :class="`nc-child-draggable-icon-${view.title}`"
+                      :class="`nc-child-draggable-icon nc-child-draggable-icon-${view.title}`"
                       @click.stop
                     >
                       mdi-drag-vertical