diff --git a/src/Gui/DlgKeyboardImp.cpp b/src/Gui/DlgKeyboardImp.cpp
index e2fa662c9d..67b28fa7a7 100644
--- a/src/Gui/DlgKeyboardImp.cpp
+++ b/src/Gui/DlgKeyboardImp.cpp
@@ -211,8 +211,7 @@ void DlgCustomKeyboardImp::on_categoryBox_activated(int index)
     }
 }
 
-/** Assigns a new accelerator to the selected command. */
-void DlgCustomKeyboardImp::on_buttonAssign_clicked()
+void DlgCustomKeyboardImp::setShortcutOfCurrentAction(const QString& accelText)
 {
     QTreeWidgetItem* item = ui->commandTreeWidget->currentItem();
     if (!item)
@@ -224,20 +223,28 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
     CommandManager & cCmdMgr = Application::Instance->commandManager();
     Command* cmd = cCmdMgr.getCommandByName(name.constData());
     if (cmd && cmd->getAction()) {
+        QString nativeText;
         Action* action = cmd->getAction();
-        QKeySequence shortcut = ui->editShortcut->text();
-        action->setShortcut(shortcut.toString(QKeySequence::NativeText));
-        ui->accelLineEditShortcut->setText(ui->editShortcut->text());
-        ui->editShortcut->clear();
+        if (!accelText.isEmpty()) {
+            QKeySequence shortcut = accelText;
+            nativeText = shortcut.toString(QKeySequence::NativeText);
+            action->setShortcut(nativeText);
+            ui->accelLineEditShortcut->setText(accelText);
+            ui->editShortcut->clear();
+        }
+        else {
+            action->setShortcut(QString());
+            ui->accelLineEditShortcut->clear();
+            ui->editShortcut->clear();
+        }
 
         // update the tool tip
-        QString accel = shortcut.toString(QKeySequence::NativeText);
         QString toolTip = QCoreApplication::translate(cmd->className(),
             cmd->getToolTipText());
-        if (!accel.isEmpty()) {
+        if (!nativeText.isEmpty()) {
             if (!toolTip.isEmpty()) {
                 QString tip = QString::fromLatin1("%1 (%2)")
-                    .arg(toolTip, accel);
+                    .arg(toolTip, nativeText);
                 action->setToolTip(tip);
             }
         }
@@ -250,10 +257,10 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
             cmd->getStatusTip());
         if (statusTip.isEmpty())
             statusTip = toolTip;
-        if (!accel.isEmpty()) {
+        if (!nativeText.isEmpty()) {
             if (!statusTip.isEmpty()) {
                 QString tip = QString::fromLatin1("(%1)\t%2")
-                    .arg(accel, statusTip);
+                    .arg(nativeText, statusTip);
                 action->setStatusTip(tip);
             }
         }
@@ -268,41 +275,16 @@ void DlgCustomKeyboardImp::on_buttonAssign_clicked()
     }
 }
 
+/** Assigns a new accelerator to the selected command. */
+void DlgCustomKeyboardImp::on_buttonAssign_clicked()
+{
+    setShortcutOfCurrentAction(ui->editShortcut->text());
+}
+
 /** Clears the accelerator of the selected command. */
 void DlgCustomKeyboardImp::on_buttonClear_clicked()
 {
-    QTreeWidgetItem* item = ui->commandTreeWidget->currentItem();
-    if (!item)
-        return;
-
-    QVariant data = item->data(1, Qt::UserRole);
-    QByteArray name = data.toByteArray(); // command name
-
-    CommandManager & cCmdMgr = Application::Instance->commandManager();
-    Command* cmd = cCmdMgr.getCommandByName(name.constData());
-    if (cmd && cmd->getAction()) {
-        Action* action = cmd->getAction();
-        action->setShortcut(QString());
-        ui->accelLineEditShortcut->clear();
-        ui->editShortcut->clear();
-
-        // update the tool tip
-        QString toolTip = QCoreApplication::translate(cmd->className(),
-            cmd->getToolTipText());
-        action->setToolTip(toolTip);
-
-        // update the status tip
-        QString statusTip = QCoreApplication::translate(cmd->className(),
-            cmd->getStatusTip());
-        if (statusTip.isEmpty())
-            statusTip = toolTip;
-        action->setStatusTip(statusTip);
-
-        ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Shortcut");
-        hGrp->SetASCII(name.constData(), ui->accelLineEditShortcut->text().toUtf8());
-        ui->buttonAssign->setEnabled(false);
-        ui->buttonReset->setEnabled(true);
-    }
+    setShortcutOfCurrentAction(QString());
 }
 
 /** Resets the accelerator of the selected command to the default. */
diff --git a/src/Gui/DlgKeyboardImp.h b/src/Gui/DlgKeyboardImp.h
index 042d084168..682e95458f 100644
--- a/src/Gui/DlgKeyboardImp.h
+++ b/src/Gui/DlgKeyboardImp.h
@@ -65,6 +65,7 @@ protected Q_SLOTS:
 
 protected:
     void changeEvent(QEvent *e);
+    void setShortcutOfCurrentAction(const QString&);
 
 private:
     std::unique_ptr<Ui_DlgCustomKeyboard> ui;