diff --git a/client/src/components/History/CurrentHistory/HistoryNavigation.test.js b/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
index e0486579328..3fffa8e50ec 100644
--- a/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
+++ b/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
@@ -56,6 +56,11 @@ describe("History Navigation", () => {
             provide: { store },
         });
 
+        const createButton = wrapper.find("*[data-description='create new history']");
+        expect(createButton.attributes().disabled).toBeFalsy();
+        const switchButton = wrapper.find("*[data-description='switch to another history']");
+        expect(switchButton.attributes().disabled).toBeFalsy();
+
         const dropDown = wrapper.find("*[data-description='history options']");
         const optionElements = dropDown.findAll("b-dropdown-item-stub");
         const optionTexts = optionElements.wrappers.map((el) => el.text());
@@ -76,8 +81,12 @@ describe("History Navigation", () => {
             provide: { store },
         });
 
-        const dropDown = wrapper.find("*[data-description='history options']");
+        const createButton = wrapper.find("*[data-description='create new history']");
+        expect(createButton.attributes().disabled).toBeTruthy();
+        const switchButton = wrapper.find("*[data-description='switch to another history']");
+        expect(switchButton.attributes().disabled).toBeTruthy();
 
+        const dropDown = wrapper.find("*[data-description='history options']");
         const enabledOptionElements = dropDown.findAll("b-dropdown-item-stub:not([disabled])");
         const enabledOptionTexts = enabledOptionElements.wrappers.map((el) => el.text());
         expect(enabledOptionTexts).toStrictEqual(anonymousOptions);
diff --git a/client/src/components/History/CurrentHistory/HistoryNavigation.vue b/client/src/components/History/CurrentHistory/HistoryNavigation.vue
index 9d73f41cf6a..adc4d45a35e 100644
--- a/client/src/components/History/CurrentHistory/HistoryNavigation.vue
+++ b/client/src/components/History/CurrentHistory/HistoryNavigation.vue
@@ -12,7 +12,8 @@
                     data-description="create new history"
                     size="sm"
                     variant="link"
-                    title="Create new history"
+                    :disabled="currentUser.isAnonymous"
+                    :title="userTitle('Create new history')"
                     @click="$emit('createNewHistory')">
                     <Icon fixed-width icon="plus" />
                 </b-button>
@@ -23,7 +24,8 @@
                     data-description="switch to another history"
                     size="sm"
                     variant="link"
-                    title="Switch to history">
+                    :disabled="currentUser.isAnonymous"
+                    :title="userTitle('Switch to history')">
                     <Icon fixed-width icon="exchange-alt" />
                 </b-button>
 
diff --git a/config/plugins/tours/core.windows.yaml b/config/plugins/tours/core.windows.yaml
index 226150dadf6..d2318ce3c5d 100644
--- a/config/plugins/tours/core.windows.yaml
+++ b/config/plugins/tours/core.windows.yaml
@@ -6,15 +6,14 @@ tags:
   - "UI"
   - "visualization"
 
+requirements:
+  - new_history
+
 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: "Now, we will upload some tabular data into our new history."
+      intro: "First, we will upload some tabular data into our new history."
       postclick: true
 
     - element: "#btn-new"
@@ -78,7 +77,7 @@ steps:
 
     - element: "#right"
       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