From e766694d452675f149642aeca761c9c9c391c2b0 Mon Sep 17 00:00:00 2001
From: Ian Huff <ianhuff@Ians-MacBook-Pro.local>
Date: Fri, 24 Apr 2020 16:39:27 -0700
Subject: [PATCH] only close interactive session on interactive window close

---
 news/2 Fixes/11404.md                                     | 1 +
 .../datascience/interactive-common/notebookProvider.ts    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 news/2 Fixes/11404.md

diff --git a/news/2 Fixes/11404.md b/news/2 Fixes/11404.md
new file mode 100644
index 000000000000..09ac624da87e
--- /dev/null
+++ b/news/2 Fixes/11404.md	
@@ -0,0 +1 @@
+Closing the interactive window shuts down other active notebook sessions.
\ No newline at end of file
diff --git a/src/client/datascience/interactive-common/notebookProvider.ts b/src/client/datascience/interactive-common/notebookProvider.ts
index 64550b8ab506..56033370f9d3 100644
--- a/src/client/datascience/interactive-common/notebookProvider.ts
+++ b/src/client/datascience/interactive-common/notebookProvider.ts
@@ -195,7 +195,13 @@ export class NotebookProvider implements INotebookProvider {
         }
 
         Array.from(this.notebooks.values()).forEach((promise) => {
-            promise.then((notebook) => notebook.dispose()).catch(noop);
+            promise
+                .then((notebook) => {
+                    if (notebook.identity.scheme === 'history') {
+                        notebook.dispose().ignoreErrors();
+                    }
+                })
+                .catch(noop);
         });
 
         this.notebooks.clear();