diff --git a/client/src/components/History/Content/ContentOptions.vue b/client/src/components/History/Content/ContentOptions.vue
index 4c708261858..7b67a6b0dee 100644
--- a/client/src/components/History/Content/ContentOptions.vue
+++ b/client/src/components/History/Content/ContentOptions.vue
@@ -71,7 +71,7 @@ export default {
             return "Display";
         },
         displayDisabled() {
-            return ["discarded", "new", "upload"].includes(this.state);
+            return ["discarded", "new", "upload", "queued"].includes(this.state);
         },
         editButtonTitle() {
             if (this.editDisabled) {
diff --git a/client/src/components/History/CurrentHistory/HistoryNavigation.vue b/client/src/components/History/CurrentHistory/HistoryNavigation.vue
index 94213a5bb8c..c957e15d50c 100644
--- a/client/src/components/History/CurrentHistory/HistoryNavigation.vue
+++ b/client/src/components/History/CurrentHistory/HistoryNavigation.vue
@@ -8,6 +8,7 @@
             <b-button-group>
                 <b-button
                     v-b-tooltip.bottom.hover
+                    class="create-hist-btn"
                     data-description="create new history"
                     size="sm"
                     variant="link"
diff --git a/config/plugins/tours/core.windows.yaml b/config/plugins/tours/core.windows.yaml
index 7d3268c10bd..226150dadf6 100644
--- a/config/plugins/tours/core.windows.yaml
+++ b/config/plugins/tours/core.windows.yaml
@@ -9,15 +9,23 @@ tags:
 steps:
     - content: "This short tour will walk you through <b>Galaxy's Window Manager</b> feature"
 
+    - element: "#current-history-panel .create-hist-btn"
+      intro: "Before using the Window Manager, we will create a new history for this tour."
+      postclick: true
+
     - element: "#tool-panel-upload-button"
-      intro: "Before using the Window Manager, we will upload some tabular data."
+      intro: "Now, we will upload some tabular data into our new history."
       postclick: true
 
     - element: "#btn-new"
       intro: "We will be using the paste feature to create a new dataset."
       postclick: true
 
-    - element: ".upload-text-content"
+    - element: "#upload-row-0 .upload-title"
+      intro: "Giving the dataset a name"
+      textinsert: First Dataset
+
+    - element: "#upload-row-0 .upload-text-content"
       intro: "...and paste content into the text area field."
       textinsert: |
         1 0.039 0.000
@@ -39,6 +47,23 @@ steps:
         - ".upload-space_to_tab"
         - ".popover-close"
 
+    - element: "#btn-new"
+      intro: "We will create another dataset, so that we can try the Window Manager on multiple datasets."
+      postclick: true
+
+    - element: "#upload-row-1 .upload-title"
+      intro: "Giving the second dataset a name"
+      textinsert: Second Dataset
+
+    - element: "#upload-row-1 .upload-text-content"
+      intro: "...and paste content into the text area field again."
+      textinsert: |
+        1 0.069 0.000
+        2 0.711 0.000
+        3 0.999 0.000
+        4 0.420 0.000
+        5 0.190 0.000
+
     - element: "#btn-start"
       intro: "Upload the data into your Galaxy history."
       postclick: true
@@ -52,9 +77,9 @@ steps:
       postclick: true
 
     - element: "#right"
-      intro: "This is your history. It contains all datasets you are currently working with including our uploaded table."
-
-    - element: "#current-history-panel div.content-item .display-btn"
+      intro: "This is your history. It contains our two tables being uploaded."
+    
+    - component: history_panel.item(hid=1,state=ok).display_button
       intro: "Clicking the eye-icon usually displays a dataset in the center panel."
       postclick: true
 
@@ -62,4 +87,8 @@ steps:
       intro: "However while using the Window Manager, the dataset will be shown as resizable window."
 
     - title: "Done."
-      intro: "You have created a Window. Click on the background and select more datasets."
+      intro: "You have created a Window. Click on eye-icon for the other dataset to view it in a window as well."
+
+    - component: history_panel.item(hid=2,state=ok).display_button
+      intro: "View the second dataset in a window as well."
+      postclick: true