diff --git a/src/renderer/components/WorkspaceTabQuery.vue b/src/renderer/components/WorkspaceTabQuery.vue
index 72dc06a1..83017eb7 100644
--- a/src/renderer/components/WorkspaceTabQuery.vue
+++ b/src/renderer/components/WorkspaceTabQuery.vue
@@ -97,32 +97,6 @@
                >
                   <BaseIcon icon-name="mdiBrush" :size="24" />
                </button>
-               <button
-                  class="btn btn-dark btn-sm"
-                  :disabled="isQuering"
-                  :title="t('general.history')"
-                  @click="openHistoryModal()"
-               >
-                  <BaseIcon icon-name="mdiHistory" :size="24" />
-               </button>
-               <div class="btn-group">
-                  <button
-                     class="btn btn-dark btn-sm mr-0"
-                     :disabled="isQuering || (isQuerySaved || query.length < 5)"
-                     :title="t('general.save')"
-                     @click="saveQuery()"
-                  >
-                     <BaseIcon icon-name="mdiHeartPlusOutline" :size="24" />
-                  </button>
-                  <button
-                     class="btn btn-dark btn-sm"
-                     :disabled="isQuering"
-                     :title="t('database.savedQueries')"
-                     @click="openSavedModal()"
-                  >
-                     <BaseIcon icon-name="mdiNotebookHeartOutline" :size="24" />
-                  </button>
-               </div>
                <div class="btn-group">
                   <button
                      class="btn btn-dark btn-sm mr-0"
@@ -147,6 +121,32 @@
                      <BaseIcon icon-name="mdiFolderOpenOutline" :size="24" />
                   </button>
                </div>
+               <div class="btn-group">
+                  <button
+                     class="btn btn-dark btn-sm mr-0"
+                     :disabled="isQuering || (isQuerySaved || query.length < 5)"
+                     :title="t('application.saveAsNote')"
+                     @click="saveQuery()"
+                  >
+                     <BaseIcon icon-name="mdiHeartPlusOutline" :size="24" />
+                  </button>
+                  <button
+                     class="btn btn-dark btn-sm"
+                     :disabled="isQuering"
+                     :title="t('database.savedQueries')"
+                     @click="openSavedModal()"
+                  >
+                     <BaseIcon icon-name="mdiNotebookHeartOutline" :size="24" />
+                  </button>
+               </div>
+               <button
+                  class="btn btn-dark btn-sm"
+                  :disabled="isQuering"
+                  :title="t('general.history')"
+                  @click="openHistoryModal()"
+               >
+                  <BaseIcon icon-name="mdiHistory" :size="24" />
+               </button>
                <div class="dropdown table-dropdown pr-2">
                   <button
                      :disabled="!hasResults || isQuering"
@@ -731,6 +731,7 @@ const openFile = async () => {
          filePath.value = file;
          queryName.value = fileName;
          query.value = content;
+         lastSavedQuery.value = content;
       }
    }
 };
diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts
index b350c79e..2f0f08e1 100644
--- a/src/renderer/i18n/en-US.ts
+++ b/src/renderer/i18n/en-US.ts
@@ -397,6 +397,7 @@ export const enUS = {
       thereAreNoNotesYet: 'There are no notes yet',
       addNote: 'Add note',
       editNote: 'Edit note',
+      saveAsNote: 'Save as note',
       showArchivedNotes: 'Show archived notes',
       hideArchivedNotes: 'Hide archived notes',
       tag: 'Tag', // Note tag,