diff --git a/src/client/datascience/interactive-ipynb/autoSaveService.ts b/src/client/datascience/interactive-ipynb/autoSaveService.ts
index 61f69e225490..826b2a7c0c1e 100644
--- a/src/client/datascience/interactive-ipynb/autoSaveService.ts
+++ b/src/client/datascience/interactive-ipynb/autoSaveService.ts
@@ -120,7 +120,7 @@ export class AutoSaveService implements IInteractiveWindowListener {
     private save() {
         this.clearTimeout();
         const notebook = this.getNotebook();
-        if (notebook && notebook.isDirty) {
+        if (notebook && notebook.isDirty && !notebook.isUntitled) {
             // Notify webview to perform a save.
             this.postEmitter.fire({ message: InteractiveWindowMessages.DoSave, payload: undefined });
         } else {
diff --git a/src/client/datascience/interactive-ipynb/nativeEditor.ts b/src/client/datascience/interactive-ipynb/nativeEditor.ts
index 58b39b57b50c..ebadbfee0d88 100644
--- a/src/client/datascience/interactive-ipynb/nativeEditor.ts
+++ b/src/client/datascience/interactive-ipynb/nativeEditor.ts
@@ -151,6 +151,10 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
         return this._file;
     }
 
+    public get isUntitled(): boolean {
+        const baseName = path.basename(this.file.fsPath);
+        return baseName.includes(localize.DataScience.untitledNotebookFileName());
+    }
     public dispose(): void {
         super.dispose();
         this.close().ignoreErrors();
@@ -713,9 +717,7 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
             let isDirty = this._dirty;
 
             // Ask user for a save as dialog if no title
-            const baseName = path.basename(this.file.fsPath);
-            const isUntitled = baseName.includes(localize.DataScience.untitledNotebookFileName());
-            if (isUntitled) {
+            if (this.isUntitled) {
                 const filtersKey = localize.DataScience.dirtyNotebookDialogFilter();
                 const filtersObject: { [name: string]: string[] } = {};
                 filtersObject[filtersKey] = ['ipynb'];
@@ -723,8 +725,7 @@ export class NativeEditor extends InteractiveBase implements INotebookEditor {
 
                 fileToSaveTo = await this.applicationShell.showSaveDialog({
                     saveLabel: localize.DataScience.dirtyNotebookDialogTitle(),
-                    filters: filtersObject,
-                    defaultUri: isUntitled ? undefined : this.file
+                    filters: filtersObject
                 });
             }
 
diff --git a/src/client/datascience/types.ts b/src/client/datascience/types.ts
index 31c8a76ca18a..99400dfc0535 100644
--- a/src/client/datascience/types.ts
+++ b/src/client/datascience/types.ts
@@ -251,6 +251,10 @@ export interface INotebookEditor extends IInteractiveBase {
     executed: Event<INotebookEditor>;
     modified: Event<INotebookEditor>;
     saved: Event<INotebookEditor>;
+    /**
+     * Is this notebook representing an untitled file which has never been saved yet.
+     */
+    readonly isUntitled: boolean;
     /**
      * `true` if there are unpersisted changes.
      */