diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index e974ebeda5b..0277f6fe129 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -815,13 +815,15 @@ class TOPBAR_MT_edit(Menu):
 
         layout.separator()
 
+        layout.operator("wm.search_menu", text="Operator Search...", icon='VIEWZOOM')
+
+        layout.separator()
+
         # Mainly to expose shortcut since this depends on the context.
         props = layout.operator("wm.call_panel", text="Rename Active Item...", icon='OUTLINER_DATA_FONT')
         props.name = "TOPBAR_PT_name"
         props.keep_open = False
 
-        layout.operator("wm.search_menu", text="Operator Search...", icon='VIEWZOOM')
-
         layout.separator()
 
         # Should move elsewhere (impacts outliner & 3D view).
@@ -1133,7 +1135,6 @@ class TOPBAR_PT_name(Panel):
                 if item:
                     row = row_with_icon(layout, 'OBJECT_DATA')
                     row.prop(item, "name", text="")
-                    row.prop(item.data, "name", text="")
                     found = True
 
         if not found: