diff --git a/client/src/components/Panels/ProviderAwareToolBox.vue b/client/src/components/Panels/ProviderAwareToolBox.vue
index ad61547a267..37bf02520b7 100644
--- a/client/src/components/Panels/ProviderAwareToolBox.vue
+++ b/client/src/components/Panels/ProviderAwareToolBox.vue
@@ -2,7 +2,7 @@
     <ConfigProvider class="d-flex flex-column" v-slot="{ config }">
         <ToolPanelViewProvider
             v-slot="{ currentPanel, currentPanelView }"
-            :site-default-panel-view="config.default_panel_view"
+            :panel-view="config.default_panel_view"
             v-if="config.default_panel_view"
         >
             <ToolBox
diff --git a/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue b/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue
index 2ab248a6097..37e5a17bd29 100644
--- a/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue
+++ b/client/src/components/Panels/ProviderAwareToolBoxWorkflow.vue
@@ -2,7 +2,7 @@
     <ConfigProvider class="d-flex flex-column" v-slot="{ config }">
         <ToolPanelViewProvider
             v-slot="{ currentPanel, currentPanelView }"
-            :site-default-panel-view="config.default_panel_view"
+            :panel-view="config.default_panel_view"
             v-if="config.default_panel_view"
         >
             <ToolBoxWorkflow
diff --git a/client/src/components/Toolshed/RepositoryDetails/Index.vue b/client/src/components/Toolshed/RepositoryDetails/Index.vue
index cb276fedba3..3ad124fff91 100644
--- a/client/src/components/Toolshed/RepositoryDetails/Index.vue
+++ b/client/src/components/Toolshed/RepositoryDetails/Index.vue
@@ -37,11 +37,7 @@
                         </template>
                     </b-table>
                     <ConfigProvider v-slot="{ config }">
-                        <ToolPanelViewProvider
-                            v-slot="{ currentPanel }"
-                            site-default-panel-view="default"
-                            :set-default-panel-view="true"
-                        >
+                        <ToolPanelViewProvider v-slot="{ currentPanel }" :panel-view="`default`" :set-default="false">
                             <InstallationSettings
                                 v-if="showSettings"
                                 :repo="repo"
diff --git a/client/src/components/providers/ToolPanelViewProvider.js b/client/src/components/providers/ToolPanelViewProvider.js
index 8fdf131eb1b..e47bcf5c4fd 100644
--- a/client/src/components/providers/ToolPanelViewProvider.js
+++ b/client/src/components/providers/ToolPanelViewProvider.js
@@ -2,32 +2,39 @@ import { mapGetters, mapActions } from "vuex";
 
 export default {
     props: {
-        siteDefaultPanelView: {
+        panelView: {
             type: String,
             required: true,
         },
-        setDefaultPanelView: {
+        setDefault: {
             type: Boolean,
-            default: false,
+            required: false,
+            default: true,
         },
     },
     computed: {
-        ...mapGetters("panels", ["currentPanel", "currentPanelView"]),
+        ...mapGetters("panels", ["currentPanel", "currentPanelView", "panel"]),
+        localPanelView() {
+            return this.setDefault ? this.currentPanelView : this.panelView;
+        },
+        localPanel() {
+            return this.setDefault ? this.currentPanel : this.panel(this.panelView);
+        },
     },
     methods: {
-        ...mapActions("panels", ["initCurrentPanelView", "setCurrentPanelView"]),
+        ...mapActions("panels", ["initCurrentPanelView", "fetchPanel"]),
     },
     created() {
-        if (this.setDefaultPanelView) {
-            this.setCurrentPanelView(this.siteDefaultPanelView);
+        if (this.setDefault) {
+            this.initCurrentPanelView(this.panelView);
         } else {
-            this.initCurrentPanelView(this.siteDefaultPanelView);
+            this.fetchPanel(this.panelView);
         }
     },
     render() {
         return this.$scopedSlots.default({
-            currentPanel: this.currentPanel,
-            currentPanelView: this.currentPanelView,
+            currentPanel: this.localPanel,
+            currentPanelView: this.localPanelView,
         });
     },
 };
diff --git a/client/src/store/panelStore.js b/client/src/store/panelStore.js
index ba8a3640aee..09614b9f9d6 100644
--- a/client/src/store/panelStore.js
+++ b/client/src/store/panelStore.js
@@ -42,6 +42,10 @@ const actions = {
         const { data } = await axios.get(`${getAppRoot()}api/tools?in_panel=true&view=${panelView}`);
         commit("savePanelView", { panelView, panel: data });
     },
+    fetchPanel: async ({ commit }, panelView) => {
+        const { data } = await axios.get(`${getAppRoot()}api/tools?in_panel=true&view=${panelView}`);
+        commit("savePanelView", { panelView, panel: data });
+    },
 };
 
 const mutations = {