diff --git a/src/components/Navigator/Navigator.tsx b/src/components/Navigator/Navigator.tsx
index 3616b244c..e4fa3d6c4 100644
--- a/src/components/Navigator/Navigator.tsx
+++ b/src/components/Navigator/Navigator.tsx
@@ -52,11 +52,20 @@ const Navigator: React.FC = () => {
 
     if (cmp(APP_VERSION, "2.1.0") !== 1 && !notifiedAboutNavigator) {
       notify({
-        text: intl.formatMessage({
-          defaultMessage:
-            "Our new feature to help you with your daily task. Run Navigator using Ctrl+K shortcut. (Cmd+K for Mac users)",
-          description: "navigator notification"
-        }),
+        autohide: null,
+        text: intl.formatMessage(
+          {
+            defaultMessage:
+              "Our new feature to help you with your daily tasks. Run Navigator using {keyboardShortcut} shortcut.",
+            description: "navigator notification"
+          },
+          {
+            keyboardShortcut:
+              navigator.platform.toLowerCase().indexOf("mac") >= 0
+                ? "⌘+K"
+                : "Ctrl+K"
+          }
+        ),
         title: intl.formatMessage({
           defaultMessage: "Navigator is here to help",
           description: "navigator notification title"
diff --git a/src/components/messages/MessageManager.tsx b/src/components/messages/MessageManager.tsx
index 2ab9a38f4..e580ce721 100644
--- a/src/components/messages/MessageManager.tsx
+++ b/src/components/messages/MessageManager.tsx
@@ -56,7 +56,7 @@ export class MessageManager extends React.Component<{}, MessageManagerState> {
   };
 
   render() {
-    const { title, text, key, onUndo } = this.state.message;
+    const { autohide = 3000, title, text, key, onUndo } = this.state.message;
     return (
       <>
         <Snackbar
@@ -66,7 +66,7 @@ export class MessageManager extends React.Component<{}, MessageManagerState> {
             vertical: "top"
           }}
           open={this.state.opened}
-          autoHideDuration={3000}
+          autoHideDuration={autohide}
           onClose={this.handleClose}
           onExited={this.handleExited}
           ContentProps={{
diff --git a/src/components/messages/index.ts b/src/components/messages/index.ts
index 0d8b80300..95424f09f 100644
--- a/src/components/messages/index.ts
+++ b/src/components/messages/index.ts
@@ -1,6 +1,7 @@
 import { createContext } from "react";
 
 export interface IMessage {
+  autohide?: number;
   title?: string;
   text: string;
   onUndo?: () => void;