diff --git a/client/src/components/Collections/ListCollectionCreator.vue b/client/src/components/Collections/ListCollectionCreator.vue
index ca9e25aec416..d33f98927d83 100644
--- a/client/src/components/Collections/ListCollectionCreator.vue
+++ b/client/src/components/Collections/ListCollectionCreator.vue
@@ -414,6 +414,7 @@ function renameElement(element: any, name: string) {
                 :extensions="extensions"
                 collection-type="list"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
+                :show-upload="!fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @on-update-datatype-toggle="changeDatatypeFilter"
                 @onUpdateHideSourceItems="onUpdateHideSourceItems"
diff --git a/client/src/components/Collections/PairCollectionCreator.vue b/client/src/components/Collections/PairCollectionCreator.vue
index 1d3e5922f315..c00c2c0f9b1e 100644
--- a/client/src/components/Collections/PairCollectionCreator.vue
+++ b/client/src/components/Collections/PairCollectionCreator.vue
@@ -376,6 +376,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                 :extensions-toggle="removeExtensions"
                 collection-type="paired"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
+                :show-upload="!fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @onUpdateHideSourceItems="onUpdateHideSourceItems"
                 @clicked-create="clickedCreate"
diff --git a/client/src/components/Collections/PairedListCollectionCreator.vue b/client/src/components/Collections/PairedListCollectionCreator.vue
index 620252f7c281..1f831e66a79c 100644
--- a/client/src/components/Collections/PairedListCollectionCreator.vue
+++ b/client/src/components/Collections/PairedListCollectionCreator.vue
@@ -881,6 +881,7 @@ function _naiveStartingAndEndingLCS(s1: string, s2: string) {
                 :extensions="extensions"
                 collection-type="list:paired"
                 :no-items="props.initialElements.length == 0 && !props.fromSelection"
+                :show-upload="!fromSelection"
                 @add-uploaded-files="addUploadedFiles"
                 @onUpdateHideSourceItems="hideSourceItems = $event"
                 @clicked-create="clickedCreate"
diff --git a/client/src/components/Collections/common/CollectionCreator.vue b/client/src/components/Collections/common/CollectionCreator.vue
index c60e80099fd2..6947a1d592fb 100644
--- a/client/src/components/Collections/common/CollectionCreator.vue
+++ b/client/src/components/Collections/common/CollectionCreator.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { faChevronDown, faChevronUp, faPlus, faUpload } from "@fortawesome/free-solid-svg-icons";
+import { faPlus, faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { BAlert, BButton, BFormCheckbox, BFormGroup, BFormInput, BLink, BTab, BTabs } from "bootstrap-vue";
+import { BAlert, BTab, BTabs } from "bootstrap-vue";
 import { storeToRefs } from "pinia";
 import { computed, ref, watch } from "vue";
 
@@ -13,6 +13,12 @@ import { useUserStore } from "@/stores/userStore";
 import localize from "@/utils/localization";
 import { orList } from "@/utils/strings";
 
+import CollectionCreatorFooterButtons from "./CollectionCreatorFooterButtons.vue";
+import CollectionCreatorHelpHeader from "./CollectionCreatorHelpHeader.vue";
+import CollectionCreatorNoItemsMessage from "./CollectionCreatorNoItemsMessage.vue";
+import CollectionCreatorShowExtensions from "./CollectionCreatorShowExtensions.vue";
+import CollectionCreatorSourceOptions from "./CollectionCreatorSourceOptions.vue";
+import CollectionNameInput from "./CollectionNameInput.vue";
 import HelpText from "@/components/Help/HelpText.vue";
 import DefaultBox from "@/components/Upload/DefaultBox.vue";
 
@@ -40,12 +46,14 @@ interface Props {
     extensionsToggle?: boolean;
     noItems?: boolean;
     collectionType?: string;
+    showUpload: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
     suggestedName: "",
     extensions: undefined,
     extensionsToggle: false,
+    showUpload: true,
 });
 
 const emit = defineEmits<{
@@ -56,7 +64,6 @@ const emit = defineEmits<{
     (e: "add-uploaded-files", value: HDASummary[]): void;
 }>();
 
-const isExpanded = ref(false);
 const currentTab = ref(Tabs.create);
 const collectionName = ref(props.suggestedName);
 const localHideSourceItems = ref(props.hideSourceItems);
@@ -122,15 +129,14 @@ function addUploadedFiles(value: HDASummary[]) {
     emit("add-uploaded-files", value);
 }
 
-function clickForHelp() {
-    isExpanded.value = !isExpanded.value;
-    return isExpanded.value;
-}
-
 function cancelCreate() {
     props.oncancel();
 }
 
+function removeExtensionsToggle() {
+    emit("remove-extensions-toggle");
+}
+
 async function loadExtensions() {
     listExtensions.value = await getUploadDatatypes(false, AUTO_EXTENSION);
     extensionsSet.value = true;
@@ -147,51 +153,15 @@ watch(
 </script>
 
 <template>
-    <BTabs v-model="currentTab" fill justified>
-        <BTab class="collection-creator" :title="localize('Create Collection')">
+    <span>
+        <span v-if="!showUpload" class="collection-creator">
             <div v-if="props.noItems">
-                <BAlert variant="info" show>
-                    {{ localize("No items available to create a collection.") }}
-                    {{ localize("Exit and change your current history, or") }}
-                    <BLink class="text-decoration-none" @click.stop.prevent="currentTab = Tabs.upload">
-                        {{ localize("Upload some datasets.") }}
-                    </BLink>
-                </BAlert>
+                <CollectionCreatorNoItemsMessage @click-upload="currentTab = Tabs.upload" />
             </div>
             <div v-else>
-                <div class="header flex-row no-flex">
-                    <div class="main-help well clear" :class="{ expanded: isExpanded }">
-                        <a
-                            class="more-help"
-                            href="javascript:void(0);"
-                            role="button"
-                            :title="localize('Expand or Close Help')"
-                            @click="clickForHelp">
-                            <div v-if="!isExpanded">
-                                <FontAwesomeIcon :icon="faChevronDown" />
-                                <span class="sr-only">{{ localize("Expand Help") }}</span>
-                            </div>
-                            <div v-else>
-                                <FontAwesomeIcon :icon="faChevronUp" />
-                                <span class="sr-only">{{ localize("Close Help") }}</span>
-                            </div>
-                        </a>
-
-                        <div class="help-content">
-                            <!-- each collection that extends this will add their own help content -->
-                            <slot name="help-content"></slot>
-
-                            <a
-                                class="more-help"
-                                href="javascript:void(0);"
-                                role="button"
-                                :title="localize('Expand or Close Help')"
-                                @click="clickForHelp">
-                                <span class="sr-only">{{ localize("Expand Help") }}</span>
-                            </a>
-                        </div>
-                    </div>
-                </div>
+                <CollectionCreatorHelpHeader>
+                    <slot name="help-content"></slot>
+                </CollectionCreatorHelpHeader>
 
                 <div class="middle flex-row flex-row-container">
                     <slot name="middle-content"></slot>
@@ -199,105 +169,103 @@ watch(
 
                 <div class="footer flex-row">
                     <div class="vertically-spaced">
-                        <div class="d-flex align-items-center justify-content-between">
-                            <BAlert v-if="extensions?.length" class="w-100 py-0" variant="secondary" show>
-                                <HelpText
-                                    uri="galaxy.collections.collectionBuilder.filteredExtensions"
-                                    :text="localize('Filtered extensions: ')" />
-                                <strong>{{ orList(extensions) }}</strong>
-                            </BAlert>
-                        </div>
+                        <CollectionCreatorShowExtensions :extensions="extensions" />
 
                         <div class="d-flex align-items-center justify-content-between">
-                            <BFormGroup class="inputs-form-group">
-                                <BFormCheckbox
-                                    v-if="renderExtensionsToggle"
-                                    name="remove-extensions"
-                                    switch
-                                    :checked="extensionsToggle"
-                                    @input="emit('remove-extensions-toggle')">
-                                    {{ localize("Remove file extensions?") }}
-                                </BFormCheckbox>
-
-                                <div data-description="hide original elements">
-                                    <BFormCheckbox v-model="localHideSourceItems" name="hide-originals" switch>
-                                        <HelpText
-                                            uri="galaxy.collections.collectionBuilder.hideOriginalElements"
-                                            :text="localize('Hide original elements')" />
-                                    </BFormCheckbox>
-                                </div>
-                            </BFormGroup>
-
-                            <BFormGroup
-                                class="flex-gapx-1 d-flex align-items-center w-50 inputs-form-group"
-                                :label="localize('Name:')"
-                                label-for="collection-name">
-                                <BFormInput
-                                    id="collection-name"
-                                    v-model="collectionName"
-                                    class="collection-name"
-                                    :placeholder="localize('Enter a name for your new ' + shortWhatIsBeingCreated)"
-                                    size="sm"
-                                    required
-                                    :state="!collectionName ? false : null" />
-                            </BFormGroup>
+                            <CollectionCreatorSourceOptions
+                                v-model="localHideSourceItems"
+                                :render-extensions-toggle="renderExtensionsToggle"
+                                :extensions-toggle="extensionsToggle"
+                                @remove-extensions-toggle="removeExtensionsToggle" />
+                            <CollectionNameInput
+                                v-model="collectionName"
+                                :short-what-is-being-created="shortWhatIsBeingCreated" />
                         </div>
                     </div>
 
-                    <div class="actions vertically-spaced d-flex justify-content-between">
-                        <BButton tabindex="-1" @click="cancelCreate">
-                            {{ localize("Cancel") }}
-                        </BButton>
-
-                        <BButton
-                            class="create-collection"
-                            variant="primary"
-                            :disabled="!validInput"
-                            @click="emit('clicked-create', collectionName)">
-                            {{ localize("Create " + shortWhatIsBeingCreated) }}
-                        </BButton>
-                    </div>
+                    <CollectionCreatorFooterButtons
+                        :short-what-is-being-created="shortWhatIsBeingCreated"
+                        :valid-input="validInput"
+                        @clicked-cancel="cancelCreate"
+                        @clicked-create="emit('clicked-create', collectionName)" />
                 </div>
             </div>
-        </BTab>
-        <BTab>
-            <template v-slot:title>
-                <FontAwesomeIcon :icon="faUpload" fixed-width />
-                <span>{{ localize("Upload Files to Add to Collection") }}</span>
-            </template>
-            <!-- TODO: This is incomplete; need to return uploadValues to parent -->
-            <DefaultBox
-                v-if="configOptions && extensionsSet"
-                :chunk-upload-size="configOptions.chunkUploadSize"
-                :default-db-key="configOptions.defaultDbKey"
-                :default-extension="defaultExtension"
-                :effective-extensions="props.extensions?.length ? validExtensions : listExtensions"
-                :file-sources-configured="configOptions.fileSourcesConfigured"
-                :ftp-upload-site="ftpUploadSite"
-                :has-callback="false"
-                :history-id="historyId"
-                :list-db-keys="[]"
-                disable-footer
-                emit-uploaded
-                @uploaded="addUploadedFiles"
-                @dismiss="currentTab = Tabs.create">
-                <template v-slot:footer>
-                    <div class="d-flex align-items-center justify-content-between mt-2">
-                        <BAlert v-if="extensions?.length" class="w-100 py-0" variant="secondary" show>
-                            <HelpText
-                                uri="galaxy.collections.collectionBuilder.requiredUploadExtensions"
-                                :text="localize('Required extensions: ')" />
-                            <strong>{{ orList(extensions) }}</strong>
-                        </BAlert>
+        </span>
+        <BTabs v-else v-model="currentTab" fill justified>
+            <BTab class="collection-creator" :title="localize('Create Collection')">
+                <div v-if="props.noItems">
+                    <CollectionCreatorNoItemsMessage @click-upload="currentTab = Tabs.upload" />
+                </div>
+                <div v-else>
+                    <CollectionCreatorHelpHeader>
+                        <slot name="help-content"></slot>
+                    </CollectionCreatorHelpHeader>
+
+                    <div class="middle flex-row flex-row-container">
+                        <slot name="middle-content"></slot>
                     </div>
+
+                    <div class="footer flex-row">
+                        <div class="vertically-spaced">
+                            <CollectionCreatorShowExtensions :extensions="extensions" />
+
+                            <div class="d-flex align-items-center justify-content-between">
+                                <CollectionCreatorSourceOptions
+                                    v-model="localHideSourceItems"
+                                    :render-extensions-toggle="renderExtensionsToggle"
+                                    :extensions-toggle="extensionsToggle" />
+                                <CollectionNameInput
+                                    v-model="collectionName"
+                                    :short-what-is-being-created="shortWhatIsBeingCreated" />
+                            </div>
+                        </div>
+
+                        <CollectionCreatorFooterButtons
+                            :short-what-is-being-created="shortWhatIsBeingCreated"
+                            :valid-input="validInput"
+                            @clicked-cancel="cancelCreate"
+                            @clicked-create="emit('clicked-create', collectionName)" />
+                    </div>
+                </div>
+            </BTab>
+            <BTab>
+                <template v-slot:title>
+                    <FontAwesomeIcon :icon="faUpload" fixed-width />
+                    <span>{{ localize("Upload Files to Add to Collection") }}</span>
                 </template>
-                <template v-slot:emit-btn-txt>
-                    <FontAwesomeIcon :icon="faPlus" fixed-width />
-                    {{ localize("Add Uploaded") }}
-                </template>
-            </DefaultBox>
-        </BTab>
-    </BTabs>
+                <DefaultBox
+                    v-if="configOptions && extensionsSet"
+                    :chunk-upload-size="configOptions.chunkUploadSize"
+                    :default-db-key="configOptions.defaultDbKey"
+                    :default-extension="defaultExtension"
+                    :effective-extensions="props.extensions?.length ? validExtensions : listExtensions"
+                    :file-sources-configured="configOptions.fileSourcesConfigured"
+                    :ftp-upload-site="ftpUploadSite"
+                    :has-callback="false"
+                    :history-id="historyId"
+                    :list-db-keys="[]"
+                    disable-footer
+                    emit-uploaded
+                    @uploaded="addUploadedFiles"
+                    @dismiss="currentTab = Tabs.create">
+                    <template v-slot:footer>
+                        <div class="d-flex align-items-center justify-content-between mt-2">
+                            <BAlert v-if="extensions?.length" class="w-100 py-0" variant="secondary" show>
+                                <HelpText
+                                    uri="galaxy.collections.collectionBuilder.requiredUploadExtensions"
+                                    :text="localize('Required extensions: ')" />
+                                <strong>{{ orList(extensions) }}</strong>
+                            </BAlert>
+                        </div>
+                    </template>
+                    <template v-slot:emit-btn-txt>
+                        <FontAwesomeIcon :icon="faPlus" fixed-width />
+                        {{ localize("Add Uploaded") }}
+                    </template>
+                </DefaultBox>
+            </BTab>
+        </BTabs>
+    </span>
 </template>
 
 <style lang="scss">
diff --git a/client/src/components/Collections/common/CollectionCreatorFooterButtons.vue b/client/src/components/Collections/common/CollectionCreatorFooterButtons.vue
new file mode 100644
index 000000000000..3137ade35ad7
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionCreatorFooterButtons.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+
+interface Props {
+    validInput: boolean;
+    shortWhatIsBeingCreated: string;
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+    (e: "clicked-create"): void;
+    (e: "clicked-cancel"): void;
+}>();
+</script>
+
+<template>
+    <div class="actions vertically-spaced d-flex justify-content-between">
+        <BButton tabindex="-1" @click="emit('clicked-cancel')">
+            {{ localize("Cancel") }}
+        </BButton>
+
+        <BButton class="create-collection" variant="primary" :disabled="!validInput" @click="emit('clicked-create')">
+            {{ localize("Create " + shortWhatIsBeingCreated) }}
+        </BButton>
+    </div>
+</template>
diff --git a/client/src/components/Collections/common/CollectionCreatorHelpHeader.vue b/client/src/components/Collections/common/CollectionCreatorHelpHeader.vue
new file mode 100644
index 000000000000..2564230253d3
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionCreatorHelpHeader.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { faChevronDown, faChevronUp } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { ref } from "vue";
+
+import localize from "@/utils/localization";
+
+const isExpanded = ref(false);
+
+function clickForHelp() {
+    isExpanded.value = !isExpanded.value;
+    return isExpanded.value;
+}
+</script>
+
+<template>
+    <div class="header flex-row no-flex">
+        <div class="main-help well clear" :class="{ expanded: isExpanded }">
+            <a
+                class="more-help"
+                href="javascript:void(0);"
+                role="button"
+                :title="localize('Expand or Close Help')"
+                @click="clickForHelp">
+                <div v-if="!isExpanded">
+                    <FontAwesomeIcon :icon="faChevronDown" />
+                    <span class="sr-only">{{ localize("Expand Help") }}</span>
+                </div>
+                <div v-else>
+                    <FontAwesomeIcon :icon="faChevronUp" />
+                    <span class="sr-only">{{ localize("Close Help") }}</span>
+                </div>
+            </a>
+
+            <div class="help-content">
+                <!-- each collection that extends this will add their own help content -->
+                <slot></slot>
+
+                <a
+                    class="more-help"
+                    href="javascript:void(0);"
+                    role="button"
+                    :title="localize('Expand or Close Help')"
+                    @click="clickForHelp">
+                    <span class="sr-only">{{ localize("Expand Help") }}</span>
+                </a>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/client/src/components/Collections/common/CollectionCreatorNoItemsMessage.vue b/client/src/components/Collections/common/CollectionCreatorNoItemsMessage.vue
new file mode 100644
index 000000000000..b525f3a28360
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionCreatorNoItemsMessage.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import { BAlert, BLink } from "bootstrap-vue";
+
+import localize from "@/utils/localization";
+
+const emit = defineEmits<{
+    (e: "clicked-upload"): void;
+}>();
+</script>
+<template>
+    <BAlert variant="info" show>
+        {{ localize("No items available to create a collection.") }}
+        {{ localize("Exit and change your current history, or") }}
+        <BLink class="text-decoration-none" @click.stop.prevent="emit('clicked-upload')">
+            {{ localize("Upload some datasets.") }}
+        </BLink>
+    </BAlert>
+</template>
diff --git a/client/src/components/Collections/common/CollectionCreatorShowExtensions.vue b/client/src/components/Collections/common/CollectionCreatorShowExtensions.vue
new file mode 100644
index 000000000000..45a99b22eef8
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionCreatorShowExtensions.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { BAlert } from "bootstrap-vue";
+
+import localize from "@/utils/localization";
+import { orList } from "@/utils/strings";
+
+import HelpText from "@/components/Help/HelpText.vue";
+
+interface Props {
+    extensions?: string[];
+}
+
+defineProps<Props>();
+</script>
+
+<template>
+    <div class="d-flex align-items-center justify-content-between">
+        <BAlert v-if="extensions?.length" class="w-100 py-0" variant="secondary" show>
+            <HelpText
+                uri="galaxy.collections.collectionBuilder.filteredExtensions"
+                :text="localize('Filtered extensions: ')" />
+            <strong>{{ orList(extensions) }}</strong>
+        </BAlert>
+    </div>
+</template>
diff --git a/client/src/components/Collections/common/CollectionCreatorSourceOptions.vue b/client/src/components/Collections/common/CollectionCreatorSourceOptions.vue
new file mode 100644
index 000000000000..c35c4bd7e779
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionCreatorSourceOptions.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { BFormCheckbox, BFormGroup } from "bootstrap-vue";
+import { ref, watch } from "vue";
+
+import localize from "@/utils/localization";
+
+import HelpText from "@/components/Help/HelpText.vue";
+
+interface Props {
+    value: boolean;
+    extensionsToggle?: boolean;
+    renderExtensionsToggle?: boolean;
+}
+
+const props = defineProps<Props>();
+
+const localHideSourceItems = ref(props.value);
+
+const emit = defineEmits<{
+    (e: "input", value: boolean): void;
+    (e: "remove-extensions-toggle"): void;
+}>();
+
+// Watch for external updates to value and sync with innerValue
+watch(
+    () => props.value,
+    (newValue) => {
+        localHideSourceItems.value = newValue;
+    }
+);
+
+watch(localHideSourceItems, (newValue) => {
+    emit("input", newValue);
+});
+</script>
+
+<template>
+    <BFormGroup class="inputs-form-group">
+        <BFormCheckbox
+            v-if="renderExtensionsToggle"
+            name="remove-extensions"
+            switch
+            :checked="extensionsToggle"
+            @input="emit('remove-extensions-toggle')">
+            {{ localize("Remove file extensions?") }}
+        </BFormCheckbox>
+
+        <div data-description="hide original elements">
+            <BFormCheckbox v-model="localHideSourceItems" name="hide-originals" switch>
+                <HelpText
+                    uri="galaxy.collections.collectionBuilder.hideOriginalElements"
+                    :text="localize('Hide original elements')" />
+            </BFormCheckbox>
+        </div>
+    </BFormGroup>
+</template>
diff --git a/client/src/components/Collections/common/CollectionNameInput.vue b/client/src/components/Collections/common/CollectionNameInput.vue
new file mode 100644
index 000000000000..7f299899efb9
--- /dev/null
+++ b/client/src/components/Collections/common/CollectionNameInput.vue
@@ -0,0 +1,47 @@
+<script setup lang="ts">
+import { BFormGroup, BFormInput } from "bootstrap-vue";
+import { ref, watch } from "vue";
+
+import localize from "@/utils/localization";
+
+interface Props {
+    value: string;
+    shortWhatIsBeingCreated: string;
+}
+
+const props = defineProps<Props>();
+
+const name = ref(props.value);
+
+const emit = defineEmits<{
+    (e: "input", value: string): void;
+}>();
+
+// Watch for external updates to value and sync with innerValue
+watch(
+    () => props.value,
+    (newValue) => {
+        name.value = newValue;
+    }
+);
+
+watch(name, (newValue) => {
+    emit("input", newValue);
+});
+</script>
+
+<template>
+    <BFormGroup
+        class="flex-gapx-1 d-flex align-items-center w-50 inputs-form-group"
+        :label="localize('Name:')"
+        label-for="collection-name">
+        <BFormInput
+            id="collection-name"
+            v-model="name"
+            class="collection-name"
+            :placeholder="localize('Enter a name for your new ' + shortWhatIsBeingCreated)"
+            size="sm"
+            required
+            :state="!name ? false : null" />
+    </BFormGroup>
+</template>
diff --git a/client/src/components/JobInformation/JobInformation.test.js b/client/src/components/JobInformation/JobInformation.test.js
index 8cc65b9499c3..1092c0e422a4 100644
--- a/client/src/components/JobInformation/JobInformation.test.js
+++ b/client/src/components/JobInformation/JobInformation.test.js
@@ -69,8 +69,8 @@ describe("JobInformation/JobInformation.vue", () => {
         // table should exist
         expect(jobInfoTable).toBeTruthy();
         const rows = jobInfoTable.findAll("tr");
-        // should contain 9 rows
-        expect(rows.length).toBe(9);
+        // should contain 10 rows
+        expect(rows.length).toBe(10);
     });
 
     it("stdout and stderr should be rendered", async () => {
@@ -98,5 +98,6 @@ describe("JobInformation/JobInformation.vue", () => {
             { id: "encoded-copied-from-job-id", backend_key: "copied_from_job_id" },
         ];
         verifyValues(rendered_entries, jobInfoTable, jobResponse);
+        expect(wrapper.find('td[data-description="galaxy-job-state"]').exists()).toBe(true);
     });
 });
diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
index 22871692e6fe..8e63e8dea2eb 100644
--- a/client/src/components/JobInformation/JobInformation.vue
+++ b/client/src/components/JobInformation/JobInformation.vue
@@ -39,11 +39,15 @@ const stderr_position = computed(() => stderr_text.value.length);
 const runTime = computed(() => getJobDuration(job.value));
 
 function jobStateIsTerminal(jobState) {
-    return jobState && !NON_TERMINAL_STATES.includes(job.value.state);
+    return jobState && !NON_TERMINAL_STATES.includes(jobState);
 }
 
-const jobIsTerminal = computed(() => jobStateIsTerminal(job?.value?.state));
+function jobStateIsRunning(jobState) {
+    return jobState == "running";
+}
 
+const jobIsTerminal = computed(() => jobStateIsTerminal(job?.value?.state));
+const jobIsRunning = computed(() => jobStateIsRunning(job?.value?.state));
 const routeToInvocation = computed(() => `/workflows/invocations/${invocationId.value}`);
 
 const metadataDetail = ref({
@@ -127,6 +131,7 @@ watch(
     <div>
         <JobDetailsProvider auto-refresh :job-id="props.job_id" @update:result="updateJob" />
         <JobConsoleOutputProvider
+            v-if="jobIsRunning"
             auto-refresh
             :job-id="props.job_id"
             :stdout_position="stdout_position"
diff --git a/client/src/components/JobInformation/testData/jobInformationResponse.json b/client/src/components/JobInformation/testData/jobInformationResponse.json
index a53d9efa9108..4a74f832272d 100644
--- a/client/src/components/JobInformation/testData/jobInformationResponse.json
+++ b/client/src/components/JobInformation/testData/jobInformationResponse.json
@@ -7,5 +7,6 @@
     "command_line": "commandline",
     "job_messages": ["test-msg1", "test-msg2", "test-msg3", "test-msg4"],
     "id": "test_id",
-    "copied_from_job_id": "test_copied_from_job_id"
+    "copied_from_job_id": "test_copied_from_job_id",
+    "state": "running"
 }
diff --git a/lib/galaxy/tool_util/parser/parameter_validators.py b/lib/galaxy/tool_util/parser/parameter_validators.py
index 29af9494b0bd..f850e0acce85 100644
--- a/lib/galaxy/tool_util/parser/parameter_validators.py
+++ b/lib/galaxy/tool_util/parser/parameter_validators.py
@@ -668,9 +668,9 @@ def raise_error_if_valiation_fails(
         raise AssertionError("Validator logic problem - computed validation value must be boolean")
     if message is None:
         message = validator.message
-    if message is None:
+    if not message:
         message = DEFAULT_VALIDATOR_MESSAGE
-    assert message
+    assert message is not None
     if value_to_show and "%s" in message:
         message = message % value_to_show
     negate = validator.negate
diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py
index 7e715538262b..7d66d3a49a6a 100644
--- a/lib/galaxy/tool_util/verify/interactor.py
+++ b/lib/galaxy/tool_util/verify/interactor.py
@@ -1688,7 +1688,7 @@ def adapt_tool_source_dict(processed_dict: ToolTestDict) -> ToolTestDescriptionD
 
     if not error_in_test_definition:
         processed_test_dict = cast(ValidToolTestDict, processed_dict)
-        maxseconds = _get_maxseconds(processed_test_dict)
+        maxseconds = processed_test_dict.get("maxseconds")
         output_collections = processed_test_dict.get("output_collections", [])
         if "num_outputs" in processed_test_dict and processed_test_dict["num_outputs"]:
             num_outputs = int(processed_test_dict["num_outputs"])
@@ -1750,10 +1750,6 @@ def _get_test_name(test_dict: Union[ToolTestDict, ToolTestDescriptionDict], test
     return name
 
 
-def _get_maxseconds(test_dict: Union[ToolTestDict, ToolTestDescriptionDict]) -> int:
-    return int(cast(Union[str, int], test_dict.get("maxseconds") or DEFAULT_TOOL_TEST_WAIT or 86400))
-
-
 def expanded_inputs_from_json(expanded_inputs_json: ExpandedToolInputsJsonified) -> ExpandedToolInputs:
     loaded_inputs: ExpandedToolInputs = {}
     for key, value in expanded_inputs_json.items():
@@ -1829,7 +1825,7 @@ def __init__(self, json_dict: ToolTestDescriptionDict):
         self.inputs = expanded_inputs_from_json(json_dict.get("inputs", {}))
         self.tool_id = json_dict["tool_id"]
         self.tool_version = json_dict.get("tool_version")
-        self.maxseconds = _get_maxseconds(json_dict)
+        self.maxseconds = json_dict.get("maxseconds")
 
     def test_data(self):
         """
@@ -1839,31 +1835,31 @@ def test_data(self):
 
     def to_dict(self) -> ToolTestDescriptionDict:
         inputs = expanded_inputs_to_json(self.inputs)
-        return ToolTestDescriptionDict(
-            {
-                "inputs": inputs,
-                "outputs": self.outputs,
-                "output_collections": [_.to_dict() for _ in self.output_collections],
-                "num_outputs": self.num_outputs,
-                "command_line": self.command_line,
-                "command_version": self.command_version,
-                "stdout": self.stdout,
-                "stderr": self.stderr,
-                "expect_exit_code": self.expect_exit_code,
-                "expect_failure": self.expect_failure,
-                "expect_test_failure": self.expect_test_failure,
-                "name": self.name,
-                "test_index": self.test_index,
-                "tool_id": self.tool_id,
-                "tool_version": self.tool_version,
-                "required_files": self.required_files,
-                "required_data_tables": self.required_data_tables,
-                "required_loc_files": self.required_loc_files,
-                "error": self.error,
-                "exception": self.exception,
-                "maxseconds": self.maxseconds,
-            }
-        )
+        test_description_def: ToolTestDescriptionDict = {
+            "inputs": inputs,
+            "outputs": self.outputs,
+            "output_collections": [_.to_dict() for _ in self.output_collections],
+            "num_outputs": self.num_outputs,
+            "command_line": self.command_line,
+            "command_version": self.command_version,
+            "stdout": self.stdout,
+            "stderr": self.stderr,
+            "expect_exit_code": self.expect_exit_code,
+            "expect_failure": self.expect_failure,
+            "expect_test_failure": self.expect_test_failure,
+            "name": self.name,
+            "test_index": self.test_index,
+            "tool_id": self.tool_id,
+            "tool_version": self.tool_version,
+            "required_files": self.required_files,
+            "required_data_tables": self.required_data_tables,
+            "required_loc_files": self.required_loc_files,
+            "error": self.error,
+            "exception": self.exception,
+        }
+        if self.maxseconds is not None:
+            test_description_def["maxseconds"] = self.maxseconds
+        return ToolTestDescriptionDict(**test_description_def)
 
 
 def test_data_iter(required_files):
diff --git a/test/unit/tool_util/test_test_definition_parsing.py b/test/unit/tool_util/test_test_definition_parsing.py
index 6576660c3b00..ed5fbdaaee91 100644
--- a/test/unit/tool_util/test_test_definition_parsing.py
+++ b/test/unit/tool_util/test_test_definition_parsing.py
@@ -68,6 +68,21 @@ def _init_tool_for_path(self, path):
         tool_source = get_tool_source(path)
         self.tool_source = tool_source
 
+    def test_maxseconds_not_filled_with_default(self):
+        self._init_tool_for_path(functional_test_tool_path("simple_constructs.xml"))
+        test_dicts = list(self._parse_tests())
+        assert test_dicts[0].maxseconds is None
+        assert "maxseconds" not in test_dicts[0].to_dict()
+
+    def test_maxseconds_parsed(self):
+        self._init_tool_for_path(functional_test_tool_path("maxseconds.xml"))
+        test_def = next(iter(self._parse_tests()))
+        assert test_def.maxseconds == 5
+        test_dict = test_def.to_dict()
+        print(test_dict)
+        assert "maxseconds" in test_dict
+        assert test_dict["maxseconds"] == 5
+
     def test_simple_state_parsing(self):
         self._init_tool_for_path(functional_test_tool_path("simple_constructs.xml"))
         test_dicts = self._parse_tests()