diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json
index 96bae3055..fd3135cc7 100644
--- a/packages/pl-fe/src/locales/en.json
+++ b/packages/pl-fe/src/locales/en.json
@@ -1167,6 +1167,7 @@
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
   "keyboard_shortcuts.my_profile": "to open your profile",
+  "keyboard_shortcuts.navigate_search": "to open search page",
   "keyboard_shortcuts.notifications": "to open notifications list",
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.profile": "to open author's profile",
@@ -1326,7 +1327,7 @@
   "navigation.sidebar": "Open sidebar",
   "navigation.sidebar.close": "Close sidebar",
   "navigation.source_code": "Source code",
-  "navigation_bar.compose": "Compose a post",
+  "navigation_bar.compose": "Compose new post",
   "navigation_bar.compose_direct": "Direct message",
   "navigation_bar.compose_draft": "Edit draft post",
   "navigation_bar.compose_edit": "Edit post",
diff --git a/packages/pl-fe/src/modals/compose-modal.tsx b/packages/pl-fe/src/modals/compose-modal.tsx
index 70cdca34d..71cae843a 100644
--- a/packages/pl-fe/src/modals/compose-modal.tsx
+++ b/packages/pl-fe/src/modals/compose-modal.tsx
@@ -121,7 +121,7 @@ const ComposeModal: React.FC<BaseModalProps & ComposeModalProps> = ({
     } else if (quoteId) {
       return <FormattedMessage id='navigation_bar.compose_quote' defaultMessage='Quote post' />;
     } else {
-      return <FormattedMessage id='navigation_bar.compose' defaultMessage='Compose a post' />;
+      return <FormattedMessage id='navigation_bar.compose' defaultMessage='Compose new post' />;
     }
   };
 
diff --git a/packages/pl-fe/src/modals/hotkeys-modal.tsx b/packages/pl-fe/src/modals/hotkeys-modal.tsx
index d514230ae..0da57ab25 100644
--- a/packages/pl-fe/src/modals/hotkeys-modal.tsx
+++ b/packages/pl-fe/src/modals/hotkeys-modal.tsx
@@ -149,7 +149,14 @@ const HotkeysModal: React.FC<BaseModalProps> = ({ onClose }) => {
           <Hotkey>s</Hotkey>, <Hotkey>/</Hotkey>
         </>
       ),
-      label: <FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' />,
+      label: document.querySelector('#search') ? (
+        <FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' />
+      ) : (
+        <FormattedMessage
+          id='keyboard_shortcuts.navigate_search'
+          defaultMessage='to open search page'
+        />
+      ),
     },
     {
       key: <Hotkey>esc</Hotkey>,