diff --git a/src/views/desktop/AccountsPage.vue b/src/views/desktop/AccountsPage.vue
index de3d64aa..e467d31d 100644
--- a/src/views/desktop/AccountsPage.vue
+++ b/src/views/desktop/AccountsPage.vue
@@ -125,9 +125,9 @@
                                                                 </small>
                                                                 <v-spacer/>
                                                                 <span class="align-self-center">
-                                                                    <v-icon :class="activeAccountCategoryVisibleAccountCount > 1 ? 'drag-handle' : 'disabled'"
+                                                                    <v-icon :class="!loading && activeAccountCategoryVisibleAccountCount > 1 ? 'drag-handle' : 'disabled'"
                                                                             :icon="icons.drag"/>
-                                                                    <v-tooltip activator="parent" v-if="activeAccountCategoryVisibleAccountCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
+                                                                    <v-tooltip activator="parent" v-if="!loading && activeAccountCategoryVisibleAccountCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
                                                                 </span>
                                                             </div>
 
diff --git a/src/views/desktop/TransactionTagsPage.vue b/src/views/desktop/TransactionTagsPage.vue
index 0715a91e..7c9d7d68 100644
--- a/src/views/desktop/TransactionTagsPage.vue
+++ b/src/views/desktop/TransactionTagsPage.vue
@@ -147,9 +147,9 @@
                                             {{ $t('Cancel') }}
                                         </v-btn>
                                         <span>
-                                            <v-icon :class="availableTagCount > 1 ? 'drag-handle' : 'disabled'"
+                                            <v-icon :class="!loading && !updating && availableTagCount > 1 ? 'drag-handle' : 'disabled'"
                                                     :icon="icons.drag"/>
-                                            <v-tooltip activator="parent" v-if="availableTagCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
+                                            <v-tooltip activator="parent" v-if="!loading && !updating && availableTagCount > 1">{{ $t('Drag and Drop to Change Order') }}</v-tooltip>
                                         </span>
                                     </div>
                                 </td>