diff --git a/README.md b/README.md
index fa0e4575f..6c6276379 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ so please check out your distribution's package list to see if KeePassXC is avai
 - YubiKey challenge-response support
 - TOTP generation
 - CSV import
-- Command line interface
+- A [Command Line Interface (keepassxc-cli)](./src/cli/keepassxc-cli.1)
 - DEP and ASLR hardening
 - Stand-alone password and passphrase generator
 - Password strength meter
diff --git a/docs/KEYBINDS.md b/docs/KEYBINDS.md
index a5984bfad..94e8b3daf 100644
--- a/docs/KEYBINDS.md
+++ b/docs/KEYBINDS.md
@@ -28,6 +28,7 @@ Toggle Passwords Hidden    | Ctrl + Shift + C
 Toggle Usernames Hidden    | Ctrl + Shift + B
 Focus Search               | Ctrl + F
 Clear Search               | ESC
+Show Keyboard Shortcuts    | Ctrl + /
 
 
 
diff --git a/src/gui/EntryPreviewWidget.cpp b/src/gui/EntryPreviewWidget.cpp
index d5c2b32b2..7395f380d 100644
--- a/src/gui/EntryPreviewWidget.cpp
+++ b/src/gui/EntryPreviewWidget.cpp
@@ -50,6 +50,7 @@ EntryPreviewWidget::EntryPreviewWidget(QWidget* parent)
     // Entry
     m_ui->entryTotpButton->setIcon(filePath()->icon("actions", "chronometer"));
     m_ui->entryCloseButton->setIcon(filePath()->icon("actions", "dialog-close"));
+    m_ui->entryPasswordLabel->setFont(Font::fixedFont());
     m_ui->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show"));
     m_ui->toggleEntryNotesButton->setIcon(filePath()->onOffIcon("actions", "password-show"));
     m_ui->toggleGroupNotesButton->setIcon(filePath()->onOffIcon("actions", "password-show"));
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index bdfefab08..4bdd10e37 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -407,6 +407,7 @@ MainWindow::MainWindow()
     connect(m_ui->actionGettingStarted, SIGNAL(triggered()), SLOT(openGettingStartedGuide()));
     connect(m_ui->actionUserGuide, SIGNAL(triggered()), SLOT(openUserGuide()));
     connect(m_ui->actionOnlineHelp, SIGNAL(triggered()), SLOT(openOnlineHelp()));
+    connect(m_ui->actionKeyboardShortcuts, SIGNAL(triggered()), SLOT(openKeyboardShortcuts()));
 
 #ifdef Q_OS_MACOS
     setUnifiedTitleAndToolBarOnMac(true);
@@ -814,6 +815,12 @@ void MainWindow::openOnlineHelp()
 {
     customOpenUrl("https://keepassxc.org/docs/");
 }
+
+void MainWindow::openKeyboardShortcuts()
+{
+    customOpenUrl("https://github.com/keepassxreboot/keepassxc/blob/develop/docs/KEYBINDS.md");
+}
+
 void MainWindow::switchToDatabases()
 {
     if (m_ui->tabWidget->currentIndex() == -1) {
diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
index f72352772..1763a4ee0 100644
--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@@ -94,6 +94,7 @@ private slots:
     void openGettingStartedGuide();
     void openUserGuide();
     void openOnlineHelp();
+    void openKeyboardShortcuts();
     void switchToDatabases();
     void switchToSettings(bool enabled);
     void switchToPasswordGen(bool enabled);
diff --git a/src/gui/MainWindow.ui b/src/gui/MainWindow.ui
index 135454f61..c53ab38c4 100644
--- a/src/gui/MainWindow.ui
+++ b/src/gui/MainWindow.ui
@@ -195,7 +195,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <property name="focusPolicy">
@@ -252,6 +252,7 @@
     <addaction name="separator"/>
     <addaction name="actionGettingStarted"/>
     <addaction name="actionUserGuide"/>
+    <addaction name="actionKeyboardShortcuts"/>
     <addaction name="actionOnlineHelp"/>
     <addaction name="separator"/>
     <addaction name="actionCheckForUpdates"/>
@@ -759,6 +760,14 @@
     <string>Open User Guide PDF</string>
    </property>
   </action>
+  <action name="actionKeyboardShortcuts">
+   <property name="text">
+    <string>&amp;Keyboard Shortcuts</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+/</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>