diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue
index e5bdd51663f5..87820cc697e3 100644
--- a/client/src/components/ActivityBar/ActivityBar.vue
+++ b/client/src/components/ActivityBar/ActivityBar.vue
@@ -228,6 +228,7 @@ defineExpose({
                                 v-if="activity.id === 'upload'"
                                 :id="`${activity.id}`"
                                 :key="activity.id"
+                                :activity-bar-id="props.activityBarId"
                                 :icon="activity.icon"
                                 :title="activity.title"
                                 :tooltip="activity.tooltip" />
@@ -235,6 +236,7 @@ defineExpose({
                                 v-else-if="activity.to && activity.id === 'interactivetools'"
                                 :id="`${activity.id}`"
                                 :key="activity.id"
+                                :activity-bar-id="props.activityBarId"
                                 :icon="activity.icon"
                                 :is-active="isActiveRoute(activity.to)"
                                 :title="activity.title"
@@ -272,6 +274,7 @@ defineExpose({
                 <NotificationItem
                     v-if="isConfigLoaded && config.enable_notification_system"
                     id="notifications"
+                    :activity-bar-id="props.activityBarId"
                     :icon="faBell"
                     :is-active="isActiveSideBar('notifications') || isActiveRoute('/user/notifications')"
                     title="Notifications"
diff --git a/client/src/components/ActivityBar/Items/InteractiveItem.vue b/client/src/components/ActivityBar/Items/InteractiveItem.vue
index e9e4756344a9..e6e80ea1d34d 100644
--- a/client/src/components/ActivityBar/Items/InteractiveItem.vue
+++ b/client/src/components/ActivityBar/Items/InteractiveItem.vue
@@ -13,13 +13,14 @@ const totalCount = computed(() => entryPoints.value.length);
 
 export interface Props {
     id: string;
+    activityBarId: string;
     title: string;
     icon: IconDefinition;
     isActive: boolean;
     to: string;
 }
 
-defineProps<Props>();
+const props = defineProps<Props>();
 
 const emit = defineEmits<{
     (e: "click"): void;
@@ -27,7 +28,7 @@ const emit = defineEmits<{
 
 const tooltip = computed(() =>
     totalCount.value === 1
-        ? `You currently have 1 active interactive tool`
+        ? "You currently have 1 active interactive tool"
         : `You currently have ${totalCount.value} active interactive tools`
 );
 </script>
@@ -36,7 +37,7 @@ const tooltip = computed(() =>
     <ActivityItem
         v-if="totalCount > 0"
         :id="id"
-        :activity-bar-id="id"
+        :activity-bar-id="props.activityBarId"
         :icon="icon"
         :indicator="totalCount"
         :is-active="isActive"
diff --git a/client/src/components/ActivityBar/Items/NotificationItem.vue b/client/src/components/ActivityBar/Items/NotificationItem.vue
index 1f1dde9110e3..3bd5332c4528 100644
--- a/client/src/components/ActivityBar/Items/NotificationItem.vue
+++ b/client/src/components/ActivityBar/Items/NotificationItem.vue
@@ -11,12 +11,13 @@ const { totalUnreadCount } = storeToRefs(useNotificationsStore());
 
 export interface Props {
     id: string;
+    activityBarId: string;
     title: string;
     icon: IconDefinition;
     isActive: boolean;
 }
 
-defineProps<Props>();
+const props = defineProps<Props>();
 
 const emit = defineEmits<{
     (e: "click"): void;
@@ -32,7 +33,7 @@ const tooltip = computed(() =>
 <template>
     <ActivityItem
         :id="id"
-        :activity-bar-id="'notifications'"
+        :activity-bar-id="props.activityBarId"
         :icon="icon"
         :indicator="totalUnreadCount"
         :is-active="isActive"
diff --git a/client/src/components/ActivityBar/Items/UploadItem.vue b/client/src/components/ActivityBar/Items/UploadItem.vue
index 6d5a6df9da64..c130c4965b21 100644
--- a/client/src/components/ActivityBar/Items/UploadItem.vue
+++ b/client/src/components/ActivityBar/Items/UploadItem.vue
@@ -11,12 +11,13 @@ import ActivityItem from "@/components/ActivityBar/ActivityItem.vue";
 
 export interface Props {
     id: string;
+    activityBarId: string;
     title: string;
     icon: IconDefinition;
     tooltip: string;
 }
 
-defineProps<Props>();
+const props = defineProps<Props>();
 
 const emit = defineEmits<{
     (e: "click"): void;
@@ -40,7 +41,7 @@ function onUploadModal() {
 <template>
     <ActivityItem
         :id="id"
-        :activity-bar-id="id"
+        :activity-bar-id="props.activityBarId"
         :title="title"
         :tooltip="tooltip"
         :icon="icon"
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue
index cfb3c17149bb..3f1d7c8a468f 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionChangeWarning.vue
@@ -31,7 +31,7 @@ function onDoNotShowAgain() {
 watch(
     () => props.querySelectionBreak,
     () => {
-        dismissCountDown.value = showSelectionQueryBreakWarning ? dismissSecs.value : 0;
+        dismissCountDown.value = showSelectionQueryBreakWarning.value ? dismissSecs.value : 0;
     }
 );
 </script>
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
index 5463baab1b59..d36a3fb0d59d 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -411,5 +411,6 @@ export default {
 <style>
 .modal-with-selector {
     overflow: initial;
+    min-height: 300px; /* To make room for the selector */
 }
 </style>
diff --git a/client/src/components/Panels/ActivityPanel.vue b/client/src/components/Panels/ActivityPanel.vue
index d97512c24cc5..e0d3dd646ab8 100644
--- a/client/src/components/Panels/ActivityPanel.vue
+++ b/client/src/components/Panels/ActivityPanel.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { BButton } from "bootstrap-vue";
+import { BButton, BButtonGroup } from "bootstrap-vue";
 import { computed } from "vue";
 
 interface Props {
@@ -26,7 +26,9 @@ const hasGoToAll = computed(() => props.goToAllTitle && props.href);
             <nav unselectable="on" class="activity-panel-header-top">
                 <h2 id="activity-panel-heading" v-localize class="activity-panel-heading h-sm">{{ props.title }}</h2>
 
-                <slot name="header-buttons" />
+                <BButtonGroup>
+                    <slot name="header-buttons" />
+                </BButtonGroup>
             </nav>
 
             <slot name="header" class="activity-panel-header-description" />
diff --git a/client/src/components/Panels/WorkflowPanel.vue b/client/src/components/Panels/WorkflowPanel.vue
index d5e56f332d5c..c596363d7fe3 100644
--- a/client/src/components/Panels/WorkflowPanel.vue
+++ b/client/src/components/Panels/WorkflowPanel.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
+import { faPlus } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useMemoize, watchImmediate } from "@vueuse/core";
+import { BButton } from "bootstrap-vue";
 import { computed, ref, watch } from "vue";
 
 import { loadWorkflows, type Workflow } from "@/components/Workflow/workflows.services";
@@ -19,6 +22,7 @@ const props = defineProps<{
 const emit = defineEmits<{
     (e: "insertWorkflow", id: string, name: string): void;
     (e: "insertWorkflowSteps", id: string, stepCount: number): void;
+    (e: "createWorkflow"): void;
 }>();
 
 const scrollable = ref<HTMLDivElement | null>(null);
@@ -52,7 +56,7 @@ const loadWorkflowsOptions = {
     sortBy: "update_time",
     sortDesc: true,
     limit: 20,
-    showPublished: true,
+    showPublished: false,
     skipStepCounts: false,
 } as const;
 
@@ -138,11 +142,26 @@ watch(
 function scrollToTop() {
     scrollable.value?.scrollTo({ top: 0, behavior: "smooth" });
 }
+
+function createNew(event: Event) {
+    event.preventDefault();
+    emit("createWorkflow");
+}
 </script>
 
 <template>
     <ActivityPanel title="Workflows">
         <template v-slot:header-buttons>
+            <BButton
+                v-b-tooltip.hover.top.noninteractive
+                size="sm"
+                variant="link"
+                class="create-button"
+                title="Create new workflow"
+                href="/workflows/edit"
+                @click="createNew">
+                <FontAwesomeIcon :icon="faPlus" />
+            </BButton>
             <FavoritesButton v-model="showFavorites" tooltip="Show bookmarked" />
         </template>
 
@@ -189,4 +208,9 @@ function scrollToTop() {
     color: $text-light;
     margin: 0.5rem;
 }
+
+.create-button:hover {
+    background-color: #c8cfd6;
+    border-color: #c1c9d0;
+}
 </style>
diff --git a/client/src/components/Panels/utilities.ts b/client/src/components/Panels/utilities.ts
index 27dde0d1cf86..38f7f4d335fe 100644
--- a/client/src/components/Panels/utilities.ts
+++ b/client/src/components/Panels/utilities.ts
@@ -4,12 +4,7 @@
  */
 import { orderBy } from "lodash";
 
-import {
-    type FilterSettings as ToolFilters,
-    type Tool,
-    type ToolSection,
-    type ToolSectionLabel,
-} from "@/stores/toolStore";
+import type { FilterSettings as ToolFilters, Tool, ToolSection, ToolSectionLabel } from "@/stores/toolStore";
 import levenshteinDistance from "@/utils/levenshtein";
 
 const FILTER_KEYS = {
diff --git a/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue b/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue
index 2f28f1fcba8b..55d7a7c70d75 100644
--- a/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue
+++ b/client/src/components/User/DiskUsage/Visualizations/ObjectStoreActions.vue
@@ -17,7 +17,7 @@ const props = defineProps<Props>();
 
 library.add(faChartBar);
 
-const label = computed(() => props.data.id);
+const label = computed(() => props.data.label);
 const viewDetailsIcon = computed(() => "chart-bar");
 
 const emit = defineEmits<{
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index c6962a5322fe..182dc05823e3 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -77,7 +77,8 @@
                     v-else-if="isActiveSideBar('workflow-editor-workflows')"
                     :current-workflow-id="id"
                     @insertWorkflow="onInsertWorkflow"
-                    @insertWorkflowSteps="onInsertWorkflowSteps" />
+                    @insertWorkflowSteps="onInsertWorkflowSteps"
+                    @createWorkflow="createNewWorkflow" />
                 <WorkflowAttributes
                     v-else-if="isActiveSideBar('workflow-editor-attributes')"
                     :id="id"
@@ -739,6 +740,10 @@ export default {
         onSaveAs() {
             this.showSaveAsModal = true;
         },
+        async createNewWorkflow() {
+            await this.saveOrCreate();
+            this.$router.push("/workflows/edit");
+        },
         async saveOrCreate() {
             if (this.hasInvalidConnections) {
                 const confirmed = await this.confirm(
@@ -789,6 +794,10 @@ export default {
             if (activityId === "save-workflow-as") {
                 this.onSaveAs();
             }
+
+            if (activityId === "workflow-create") {
+                this.createNewWorkflow();
+            }
         },
         onAnnotation(nodeId, newAnnotation) {
             this.stepActions.setAnnotation(this.steps[nodeId], newAnnotation);
@@ -811,6 +820,7 @@ export default {
                 const { id, name, number_of_steps } = await this.services.createWorkflow(this);
                 const message = `Created new workflow '${name}' with ${number_of_steps} steps.`;
                 this.hasChanges = false;
+                this.$emit("skipNextReload");
                 await this.routeToWorkflow(id);
                 Toast.success(message);
             } catch (e) {
diff --git a/client/src/components/Workflow/Editor/modules/activities.ts b/client/src/components/Workflow/Editor/modules/activities.ts
index 5a5534a4af0e..365bbba411d3 100644
--- a/client/src/components/Workflow/Editor/modules/activities.ts
+++ b/client/src/components/Workflow/Editor/modules/activities.ts
@@ -6,6 +6,7 @@ import {
     faMagic,
     faPencilAlt,
     faPlay,
+    faPlus,
     faRecycle,
     faSave,
     faSignOutAlt,
@@ -126,6 +127,16 @@ export const workflowEditorActivities = [
         click: true,
         optional: true,
     },
+    {
+        description: "Save this workflow and create a new workflow.",
+        icon: faPlus,
+        title: "Create new",
+        id: "workflow-create",
+        tooltip: "Save this workflow and create a new one",
+        visible: true,
+        click: true,
+        optional: true,
+    },
     {
         description: "Exit the workflow editor and return to the start screen.",
         icon: faSignOutAlt,
diff --git a/client/src/composables/hashedUserId.ts b/client/src/composables/hashedUserId.ts
index 5d86b2dd8c42..a7f651a3c628 100644
--- a/client/src/composables/hashedUserId.ts
+++ b/client/src/composables/hashedUserId.ts
@@ -1,10 +1,11 @@
-import { useLocalStorage } from "@vueuse/core";
 import { storeToRefs } from "pinia";
 import { computed, type Ref, ref, watch } from "vue";
 
 import { type AnyUser } from "@/api";
 import { useUserStore } from "@/stores/userStore";
 
+import { usePersistentRef } from "./persistentRef";
+
 async function hash32(value: string): Promise<string> {
     const valueUtf8 = new TextEncoder().encode(value);
     const hashBuffer = await crypto.subtle.digest("SHA-256", valueUtf8);
@@ -43,7 +44,7 @@ export function useHashedUserId(user?: Ref<AnyUser>) {
     }
 
     // salt the local store, to make a user untraceable by id across different clients
-    const localStorageSalt = useLocalStorage("local-storage-salt", createSalt());
+    const localStorageSalt = usePersistentRef("local-storage-salt", createSalt());
 
     watch(
         () => currentUser.value,
diff --git a/client/src/composables/persistentRef.ts b/client/src/composables/persistentRef.ts
new file mode 100644
index 000000000000..ab511f74caaa
--- /dev/null
+++ b/client/src/composables/persistentRef.ts
@@ -0,0 +1,67 @@
+/*
+   vueuse local storage has some strange, buggy side-effects,
+   so were re-implementing just the parts we need here
+*/
+
+import { type Ref, ref, watch } from "vue";
+
+import { match } from "@/utils/utils";
+
+function stringify(value: unknown): string {
+    if (typeof value !== "object") {
+        return `${value}`;
+    } else {
+        return JSON.stringify(value);
+    }
+}
+
+function parse<T>(value: string, type: "string" | "number" | "boolean" | "object"): T {
+    return match(type, {
+        string: () => value as T,
+        number: () => parseFloat(value) as T,
+        boolean: () => (value.toLowerCase().trim() === "true" ? true : false) as T,
+        object: () => JSON.parse(value),
+    });
+}
+
+export function syncRefToLocalStorage<T>(key: string, refToSync: Ref<T>) {
+    const stored = window.localStorage.getItem(key);
+
+    const sync = () => {
+        const stringified = stringify(refToSync.value);
+        window.localStorage.setItem(key, stringified);
+    };
+
+    if (stored) {
+        try {
+            refToSync.value = parse(stored, typeof refToSync.value as "string" | "number" | "boolean" | "object");
+        } catch (e) {
+            console.error(`Failed to parse value "${stored}" from local storage key "${key}". Resetting key`);
+            sync();
+        }
+    } else {
+        sync();
+    }
+
+    watch(
+        () => refToSync.value,
+        () => {
+            sync();
+        },
+        { deep: true }
+    );
+}
+
+export function usePersistentRef(key: string, defaultValue: string): Ref<string>;
+export function usePersistentRef(key: string, defaultValue: number): Ref<number>;
+export function usePersistentRef<T>(key: string, defaultValue: T): Ref<T>;
+export function usePersistentRef<T extends string | number | boolean | object | null>(
+    key: string,
+    defaultValue: T
+): Ref<T> {
+    const storageSyncedRef = ref(defaultValue) as Ref<T>;
+
+    syncRefToLocalStorage(key, storageSyncedRef);
+
+    return storageSyncedRef;
+}
diff --git a/client/src/composables/userLocalStorage.ts b/client/src/composables/userLocalStorage.ts
index f0787732a12d..d81dfda55e09 100644
--- a/client/src/composables/userLocalStorage.ts
+++ b/client/src/composables/userLocalStorage.ts
@@ -1,9 +1,10 @@
-import { useLocalStorage } from "@vueuse/core";
-import { computed, customRef, type Ref, ref } from "vue";
+import { watchImmediate } from "@vueuse/core";
+import { type Ref, ref } from "vue";
 
 import { type AnyUser } from "@/api";
 
 import { useHashedUserId } from "./hashedUserId";
+import { syncRefToLocalStorage } from "./persistentRef";
 
 /**
  * Local storage composable specific to current user.
@@ -13,24 +14,18 @@ import { useHashedUserId } from "./hashedUserId";
 export function useUserLocalStorage<T>(key: string, initialValue: T, user?: Ref<AnyUser>) {
     const { hashedUserId } = useHashedUserId(user);
 
-    const storedRef = computed(() => {
-        if (hashedUserId.value) {
-            return useLocalStorage(`${key}-${hashedUserId.value}`, initialValue);
-        } else {
-            return ref(initialValue);
-        }
-    });
+    const refToSync = ref(initialValue);
+    let hasSynced = false;
 
-    const currentValue = customRef((track, trigger) => ({
-        get() {
-            track();
-            return storedRef.value.value;
-        },
-        set(newValue) {
-            storedRef.value.value = newValue;
-            trigger();
-        },
-    }));
+    watchImmediate(
+        () => hashedUserId.value,
+        () => {
+            if (hashedUserId.value && !hasSynced) {
+                syncRefToLocalStorage(`${key}-${hashedUserId.value}`, refToSync);
+                hasSynced = true;
+            }
+        }
+    );
 
-    return currentValue;
+    return refToSync;
 }
diff --git a/client/src/entry/analysis/modules/WorkflowEditor.vue b/client/src/entry/analysis/modules/WorkflowEditor.vue
index 67634f4a3842..b05627cfbdb1 100644
--- a/client/src/entry/analysis/modules/WorkflowEditor.vue
+++ b/client/src/entry/analysis/modules/WorkflowEditor.vue
@@ -7,7 +7,8 @@
         :initial-version="editorConfig.initialVersion"
         :module-sections="editorConfig.moduleSections"
         :workflow-tags="editorConfig.tags"
-        @update:confirmation="$emit('update:confirmation', $event)" />
+        @update:confirmation="$emit('update:confirmation', $event)"
+        @skipNextReload="() => (skipNextReload = true)" />
 </template>
 <script>
 import Editor from "components/Workflow/Editor/Index";
@@ -25,6 +26,7 @@ export default {
             version: null,
             editorConfig: null,
             editorReloadKey: 0,
+            skipNextReload: false,
         };
     },
     watch: {
@@ -39,14 +41,15 @@ export default {
         async getEditorConfig() {
             let reloadEditor = true;
 
-            // this will only be the case the first time the route updates from a new workflow
-            if (!this.storedWorkflowId && !this.workflowId) {
+            if (this.skipNextReload) {
                 reloadEditor = false;
+                this.skipNextReload = false;
             }
 
             this.storedWorkflowId = Query.get("id");
             this.workflowId = Query.get("workflow_id");
             this.version = Query.get("version");
+            this.previousHistoryLength = window.history.length;
 
             const params = {};
 
diff --git a/client/src/onload/console.js b/client/src/onload/console.js
index 96f1570eb290..06f2992be2ce 100644
--- a/client/src/onload/console.js
+++ b/client/src/onload/console.js
@@ -4,9 +4,10 @@
  * using the global functions
  * enableDebugging() and disableDebugging()
  */
-import { useLocalStorage } from "@vueuse/core";
 import { watch } from "vue";
 
+import { usePersistentRef } from "@/composables/persistentRef";
+
 export function overrideProductionConsole() {
     let defaultEnabled = true;
     let runningTest = false;
@@ -17,7 +18,7 @@ export function overrideProductionConsole() {
         runningTest = true;
     }
 
-    const isEnabled = useLocalStorage("console-debugging-enabled", defaultEnabled);
+    const isEnabled = usePersistentRef("console-debugging-enabled", defaultEnabled);
 
     let storedConsole = null;
 
diff --git a/client/src/stores/activityStore.ts b/client/src/stores/activityStore.ts
index 466ee226bf00..b74a66286f4d 100644
--- a/client/src/stores/activityStore.ts
+++ b/client/src/stores/activityStore.ts
@@ -127,10 +127,7 @@ export const useActivityStore = defineScopedStore("activityStore", (scope) => {
             }
         });
 
-        // update activities stored in local cache only if changes were applied
-        if (JSON.stringify(activities.value) !== JSON.stringify(newActivities)) {
-            activities.value = newActivities;
-        }
+        activities.value = newActivities;
 
         // if toggled side-bar does not exist, choose the first option
         if (toggledSideBar.value !== "") {
diff --git a/client/src/stores/workflowNodeInspectorStore.ts b/client/src/stores/workflowNodeInspectorStore.ts
index 6591baf1c8bb..e92683ac853d 100644
--- a/client/src/stores/workflowNodeInspectorStore.ts
+++ b/client/src/stores/workflowNodeInspectorStore.ts
@@ -1,7 +1,7 @@
-import { useLocalStorage } from "@vueuse/core";
 import { defineStore } from "pinia";
 import { computed, del, ref, set } from "vue";
 
+import { usePersistentRef } from "@/composables/persistentRef";
 import { ensureDefined } from "@/utils/assertions";
 import { getShortToolId } from "@/utils/tool";
 import { match } from "@/utils/utils";
@@ -26,10 +26,10 @@ function getContentId(step: Step) {
 
 export const useWorkflowNodeInspectorStore = defineStore("workflowNodeInspectorStore", () => {
     /** width of the node inspector if no other width is stored */
-    const generalWidth = useLocalStorage("workflowNodeInspectorGeneralWidth", 300);
+    const generalWidth = usePersistentRef("workflowNodeInspectorGeneralWidth", 300);
     /** maximized state of the node inspector if no other value is stored */
     const generalMaximized = ref(false);
-    const storedSizes = useLocalStorage<Record<string, StoredSize>>("workflowNodeInspectorStoredSizes", {});
+    const storedSizes = usePersistentRef<Record<string, StoredSize>>("workflowNodeInspectorStoredSizes", {});
 
     const isStored = computed(() => (step: Step) => {
         const id = getContentId(step);
diff --git a/client/src/style/scss/multiselect.scss b/client/src/style/scss/multiselect.scss
index 05b4b3961220..55b70ab4f24c 100644
--- a/client/src/style/scss/multiselect.scss
+++ b/client/src/style/scss/multiselect.scss
@@ -95,3 +95,7 @@
         }
     }
 }
+
+.multiselect--active {
+    z-index: 1500; // Should be on top of everything
+}
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index 0a70bf7120d5..ecb0b7a719ae 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -2085,6 +2085,7 @@ def to_json(column, keys: List[str]):
             .join(model.Workflow, model.Workflow.id == model.StoredWorkflow.latest_workflow_id)
             .filter(
                 and_(
+                    model.StoredWorkflow.deleted == false(),
                     to_json(model.Workflow.source_metadata, ["trs_tool_id"]) == trs_id,
                     to_json(model.Workflow.source_metadata, ["trs_version_id"]) == trs_version,
                 )
@@ -2096,7 +2097,7 @@ def to_json(column, keys: List[str]):
             )
         else:
             stmnt = stmnt.filter(model.StoredWorkflow.importable == true())
-        return sa_session.execute(stmnt).scalar()
+        return sa_session.execute(stmnt.order_by(model.StoredWorkflow.id.desc()).limit(1)).scalar()
 
 
 class RefactorRequest(RefactorActions):
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 8921f6ceaf6c..fb8df0939fe7 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -7732,7 +7732,7 @@ class StoredWorkflow(Base, HasTags, Dictifiable, RepresentById, UsesCreateAndUpd
         order_by=lambda: -Workflow.id,
         cascade_backrefs=False,
     )
-    latest_workflow = relationship(
+    latest_workflow: Mapped["Workflow"] = relationship(
         "Workflow",
         post_update=True,
         primaryjoin=(lambda: StoredWorkflow.latest_workflow_id == Workflow.id),
@@ -7850,7 +7850,7 @@ def show_in_tool_panel(self, user_id):
         )
         return bool(sa_session.scalar(stmt))
 
-    def copy_tags_from(self, target_user, source_workflow):
+    def copy_tags_from(self, target_user, source_workflow: "StoredWorkflow"):
         # Override to only copy owner tags.
         for src_swta in source_workflow.owner_tags:
             new_swta = src_swta.copy()
@@ -8023,7 +8023,7 @@ def top_level_stored_workflow(self):
         """
         return self.top_level_workflow.stored_workflow
 
-    def copy(self, user=None):
+    def copy(self, user: User):
         """Copy a workflow for a new StoredWorkflow object.
 
         Pass user if user-specific information needed.
@@ -8332,7 +8332,7 @@ def workflow_output_for(self, output_name):
                 break
         return target_output
 
-    def copy_to(self, copied_step, step_mapping, user=None):
+    def copy_to(self, copied_step: "WorkflowStep", step_mapping: Dict[int, "WorkflowStep"], user: User):
         copied_step.order_index = self.order_index
         copied_step.type = self.type
         copied_step.tool_id = self.tool_id
@@ -8364,10 +8364,10 @@ def copy_to(self, copied_step, step_mapping, user=None):
                 copied_step.subworkflow = subworkflow
                 copied_subworkflow = subworkflow
             else:
-                # Can this even happen, building a workflow with a subworkflow you don't own ?
-                copied_subworkflow = subworkflow.copy()
+                # Importing a shared workflow with a subworkflow step
+                copied_subworkflow = subworkflow.copy(user=user)
                 stored_workflow = StoredWorkflow(
-                    user, name=copied_subworkflow.name, workflow=copied_subworkflow, hidden=True
+                    user=user, name=copied_subworkflow.name, workflow=copied_subworkflow, hidden=True
                 )
                 copied_subworkflow.stored_workflow = stored_workflow
                 copied_step.subworkflow = copied_subworkflow
diff --git a/lib/galaxy/tool_util/deps/mulled/invfile.lua b/lib/galaxy/tool_util/deps/mulled/invfile.lua
index 38ddc860cc3b..f7bef84d18b5 100644
--- a/lib/galaxy/tool_util/deps/mulled/invfile.lua
+++ b/lib/galaxy/tool_util/deps/mulled/invfile.lua
@@ -42,7 +42,7 @@ end
 
 local conda_image = VAR.CONDA_IMAGE
 if conda_image == '' then
-    conda_image = 'quay.io/condaforge/mambaforge:latest'
+    conda_image = 'quay.io/condaforge/miniforge3:latest'
 end
 
 local conda_bin = VAR.CONDA_BIN
diff --git a/lib/galaxy/webapps/base/controller.py b/lib/galaxy/webapps/base/controller.py
index b74eae017646..c205aa85633b 100644
--- a/lib/galaxy/webapps/base/controller.py
+++ b/lib/galaxy/webapps/base/controller.py
@@ -973,7 +973,7 @@ def get_stored_workflow_steps(self, trans, stored_workflow: model.StoredWorkflow
             except exceptions.ToolMissingException:
                 pass
 
-    def _import_shared_workflow(self, trans, stored):
+    def _import_shared_workflow(self, trans, stored: model.StoredWorkflow):
         """Imports a shared workflow"""
         # Copy workflow.
         imported_stored = model.StoredWorkflow()