diff --git a/web/pgadmin/static/js/QuickSearch/menuitems_help.js b/web/pgadmin/static/js/QuickSearch/menuitems_help.js
index c7e686d62..0657b51a0 100644
--- a/web/pgadmin/static/js/QuickSearch/menuitems_help.js
+++ b/web/pgadmin/static/js/QuickSearch/menuitems_help.js
@@ -51,15 +51,7 @@ export function menuSearch(param, props) {
 
   const mainMenus = pgAdmin.Browser.MainMenus;
   mainMenus.forEach((menu) => {
-    let subMenus = [];
-    if(menu.name == 'object') {
-      let selectedNode = pgAdmin.Browser.tree.selected();
-      if(selectedNode) {
-        subMenus = menu.getMenuItems();
-      }
-    } else {
-      subMenus = pgAdmin.Browser.all_menus_cache[menu.name];
-    }
+    const subMenus = menu.getMenuItems();
     iterItem(Object.values(subMenus), getMenuName(menu));
   });
 
diff --git a/web/pgadmin/static/js/Theme/overrides/reactaspen.override.js b/web/pgadmin/static/js/Theme/overrides/reactaspen.override.js
index a46469190..ec019eb02 100644
--- a/web/pgadmin/static/js/Theme/overrides/reactaspen.override.js
+++ b/web/pgadmin/static/js/Theme/overrides/reactaspen.override.js
@@ -167,7 +167,8 @@ export default function reactAspenOverride(theme) {
         padding: '0px 4px',
         borderRadius: theme.shape.borderRadius,
         backgroundColor: 'color-mix(in srgb, color-mix(in srgb, var(--tag-color) 10%, #fff) 50%, transparent);',
-        lineHeight: 1.2
+        lineHeight: 1.2,
+        whiteSpace: 'nowrap'
       },
 
       i: {