diff --git a/src/NotepadNext/dialogs/MainWindow.cpp b/src/NotepadNext/dialogs/MainWindow.cpp
index 1eb56c5a8..5ebcd18a8 100644
--- a/src/NotepadNext/dialogs/MainWindow.cpp
+++ b/src/NotepadNext/dialogs/MainWindow.cpp
@@ -300,8 +300,8 @@ MainWindow::MainWindow(NotepadNextApplication *app) :
         copyAsFormat(&rtf, "Rich Text Format");
     });
 
-    connect(ui->actionIncrease_Indent, &QAction::triggered, this, [=]() { currentEditor()->tab(); });
-    connect(ui->actionDecrease_Indent, &QAction::triggered, this, [=]() { currentEditor()->backTab(); });
+    connect(ui->actionIncreaseIndent, &QAction::triggered, this, [=]() { currentEditor()->tab(); });
+    connect(ui->actionDecreaseIndent, &QAction::triggered, this, [=]() { currentEditor()->backTab(); });
 
     addAction(ui->actionToggleOverType);
     connect(ui->actionToggleOverType, &QAction::triggered, this, [=]() {
@@ -843,18 +843,36 @@ MainWindow::~MainWindow()
 void MainWindow::applyCustomShortcuts()
 {
     ApplicationSettings *settings = app->getSettings();
-
     settings->beginGroup("Shortcuts");
 
     for (const QString &actionName : settings->childKeys()) {
         QAction *action = findChild<QAction *>(QStringLiteral("action") + actionName, Qt::FindDirectChildrenOnly);
-        const QString shortcutString = settings->value(actionName).toString();
 
-        if (action != Q_NULLPTR) {
-            action->setShortcut(QKeySequence(shortcutString));
+        if (!action) {
+            qWarning() << "CustomShortcut: Cannot find action" << actionName;
+            continue;
         }
-        else {
-            qWarning() << "Cannot find action" << actionName;
+
+        const QVariant value = settings->value(actionName);
+        if (!value.canConvert<QStringList>()) {
+            qWarning() << "CustomShortcut: Invalid shortcut format for" << actionName;
+            continue;
+        }
+
+        QList<QKeySequence> shortcuts;
+        for (const QString &shortcutString : value.toStringList()) {
+            auto sequence = QKeySequence(shortcutString);
+
+            if (sequence.count() > 0 && sequence[0].key() != Qt::Key_unknown) {
+                shortcuts.append(sequence);
+            }
+            else {
+                qWarning() << "CustomShortcut: Cannot create QKeySequence(" << shortcutString << ") for " << actionName;
+            }
+        }
+
+        if (!shortcuts.empty()) {
+            action->setShortcuts(shortcuts);
         }
     }
 
diff --git a/src/NotepadNext/dialogs/MainWindow.ui b/src/NotepadNext/dialogs/MainWindow.ui
index d8885cb1d..68bc4040a 100644
--- a/src/NotepadNext/dialogs/MainWindow.ui
+++ b/src/NotepadNext/dialogs/MainWindow.ui
@@ -108,8 +108,6 @@
      <property name="title">
       <string>Indent</string>
      </property>
-     <addaction name="actionIncrease_Indent"/>
-     <addaction name="actionDecrease_Indent"/>
     </widget>
     <widget class="QMenu" name="menuEOLConversion">
      <property name="title">
@@ -575,7 +573,7 @@
     <string>Ctrl+A</string>
    </property>
   </action>
-  <action name="actionIncrease_Indent">
+  <action name="actionIncreaseIndent">
    <property name="icon">
     <iconset resource="../resources.qrc">
      <normaloff>:/icons/text_indent.png</normaloff>:/icons/text_indent.png</iconset>
@@ -584,7 +582,7 @@
     <string>Increase Indent</string>
    </property>
   </action>
-  <action name="actionDecrease_Indent">
+  <action name="actionDecreaseIndent">
    <property name="icon">
     <iconset resource="../resources.qrc">
      <normaloff>:/icons/text_indent_remove.png</normaloff>:/icons/text_indent_remove.png</iconset>