diff --git a/config/plugins/tours/core.windows.yaml b/config/plugins/tours/core.windows.yaml
index 7d3268c10bd..8a290be49ff 100644
--- a/config/plugins/tours/core.windows.yaml
+++ b/config/plugins/tours/core.windows.yaml
@@ -6,6 +6,9 @@ tags:
   - "UI"
   - "visualization"
 
+requirements:
+  - new_history
+
 steps:
     - content: "This short tour will walk you through <b>Galaxy's Window Manager</b> feature"
 
@@ -17,7 +20,11 @@ steps:
       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 +46,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 +76,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 +86,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