diff --git a/packages/web/src/modals/SaveArchiveModal.svelte b/packages/web/src/modals/SaveArchiveModal.svelte
index 4a3e60c89..ad6ba355c 100644
--- a/packages/web/src/modals/SaveArchiveModal.svelte
+++ b/packages/web/src/modals/SaveArchiveModal.svelte
@@ -5,11 +5,12 @@
   import FormSelectField from '../forms/FormSelectField.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FormTextField from '../forms/FormTextField.svelte';
+  import { currentArchive } from '../stores';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
 
   export let file = 'new-table';
-  export let folder = 'default';
+  export let folder = $currentArchive;
   export let onSave;
 
   const handleSubmit = async e => {
diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte
index cb1574fee..a8e549f6f 100644
--- a/packages/web/src/tabs/FreeTableTab.svelte
+++ b/packages/web/src/tabs/FreeTableTab.svelte
@@ -88,7 +88,11 @@
       ...tab,
       title: file,
       props: { archiveFile: file, archiveFolder: folder },
+      archiveFile: file,
+      archiveFolder: folder,
     }));
+    archiveFile = file;
+    archiveFolder = folder;
   };
 
   function handleRunMacro(macro, params, cells) {