diff --git a/client/src/components/History/Layout/Details.vue b/client/src/components/History/Layout/Details.vue
index 8cc62f6a927..ca8a043e0e3 100644
--- a/client/src/components/History/Layout/Details.vue
+++ b/client/src/components/History/Layout/Details.vue
@@ -39,30 +39,26 @@
                 data-description="annotation input"
                 @keyup.esc="onToggle" />
             <StatelessTags v-if="localProps.tags" class="mb-3 tags" v-model="localProps.tags" />
+            <b-button
+                class="save-button mb-1"
+                data-description="editor save button"
+                size="sm"
+                variant="primary"
+                :disabled="!localProps.name"
+                @click="onSave">
+                <Icon icon="save" />
+                <span v-localize>Save</span>
+            </b-button>
+            <b-button
+                class="cancel-button mb-1"
+                data-description="editor cancel button"
+                size="sm"
+                icon="undo"
+                @click="onToggle">
+                <Icon icon="undo" />
+                <span v-localize>Cancel</span>
+            </b-button>
         </div>
-        <nav class="edit-controls">
-            <template v-if="editing">
-                <b-button
-                    class="save-button mb-1"
-                    data-description="editor save button"
-                    size="sm"
-                    variant="primary"
-                    :disabled="!localProps.name"
-                    @click="onSave">
-                    <Icon icon="save" />
-                    <span v-localize>Save</span>
-                </b-button>
-                <b-button
-                    class="cancel-button mb-1"
-                    data-description="editor cancel button"
-                    size="sm"
-                    icon="undo"
-                    @click="onToggle">
-                    <Icon icon="undo" />
-                    <span v-localize>Cancel</span>
-                </b-button>
-            </template>
-        </nav>
     </section>
 </template>
 
@@ -90,35 +86,18 @@ export default {
             localProps: {},
         };
     },
-    watch: {
-        name() {
-            this.localProps.name = this.name;
-        },
-        annotation() {
-            this.localProps.annotation = this.annotation;
-        },
-        tags() {
-            this.localProps.tags = this.tags;
-        },
-    },
-    created() {
-        this.onReset();
-    },
     methods: {
-        onReset() {
-            this.localProps = {
-                name: this.name,
-                annotation: this.annotation,
-                tags: this.tags,
-            };
-        },
         onSave() {
             this.editing = false;
             this.$emit("save", Object.assign({}, this.localProps));
         },
         onToggle() {
             this.editing = !this.editing;
-            this.onReset();
+            this.localProps = {
+                name: this.name,
+                annotation: this.annotation,
+                tags: this.tags,
+            };
         },
     },
 };
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 95d06c49d3d..f2cfce35118 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1510,6 +1510,7 @@ class NavigatesGalaxy(HasDriver):
             editable_text_input_element.clear()
         editable_text_input_element.send_keys(new_name)
         self.send_enter(editable_text_input_element)
+        self.sleep_for(self.wait_types.UX_RENDER)
         return editable_text_input_element
 
     def history_panel_name_input(self):