diff --git a/src/Gui/DlgKeyboard.ui b/src/Gui/DlgKeyboard.ui
index d50cff090f..0e8b9f0e27 100644
--- a/src/Gui/DlgKeyboard.ui
+++ b/src/Gui/DlgKeyboard.ui
@@ -33,8 +33,8 @@
        <property name="bottomMargin">
         <number>0</number>
        </property>
-       <item row="2" column="1">
-        <widget class="QComboBox" name="categoryBox"/>
+       <item row="1" column="0" colspan="2">
+        <widget class="QLineEdit" name="editCommand"/>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="TextLabelCategory">
@@ -52,8 +52,8 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2">
-        <widget class="QLineEdit" name="editCommand"/>
+       <item row="2" column="1">
+        <widget class="QComboBox" name="categoryBox"/>
        </item>
        <item row="3" column="0" colspan="2">
         <widget class="QTreeWidget" name="commandTreeWidget">
@@ -94,6 +94,37 @@
          <property name="bottomMargin">
           <number>0</number>
          </property>
+         <item row="1" column="1">
+          <widget class="QLabel" name="textLabelShortcut">
+           <property name="text">
+            <string>Current shortcut:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="2" colspan="2">
+          <widget class="Gui::AccelLineEdit" name="accelLineEditShortcut">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1" colspan="3">
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <widget class="QLabel" name="textLabelNewShortcut">
+             <property name="text">
+              <string>&amp;New shortcut:</string>
+             </property>
+             <property name="buddy">
+              <cstring>editShortcut</cstring>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="Gui::AccelLineEdit" name="editShortcut"/>
+           </item>
+          </layout>
+         </item>
          <item row="4" column="1" colspan="2">
           <widget class="QLabel" name="label">
            <property name="toolTip">
@@ -104,13 +135,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="textLabelShortcut">
-           <property name="text">
-            <string>Current shortcut:</string>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="3">
           <widget class="Gui::PrefSpinBox" name="shortcutTimeout">
            <property name="sizePolicy">
@@ -147,6 +171,24 @@ be treated as shorctcut key sequence 'F, F'.</string>
            </property>
           </widget>
          </item>
+         <item row="5" column="1" colspan="3">
+          <widget class="QLabel" name="textLabelAssigned">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>20</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>This list shows commands having the same shortcut in the priority from high
+to low. If more than one command with the same shortcut are active at the
+same time. The one with the highest prioirty will be triggered.</string>
+           </property>
+           <property name="text">
+            <string>Shorcut priority list:</string>
+           </property>
+          </widget>
+         </item>
          <item row="6" column="1" colspan="3">
           <widget class="QTreeWidget" name="assignedTreeWidget">
            <property name="minimumSize">
@@ -168,48 +210,6 @@ be treated as shorctcut key sequence 'F, F'.</string>
            </column>
           </widget>
          </item>
-         <item row="1" column="2" colspan="2">
-          <widget class="Gui::AccelLineEdit" name="accelLineEditShortcut">
-           <property name="readOnly">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1" colspan="3">
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
-           <item>
-            <widget class="QLabel" name="textLabelNewShortcut">
-             <property name="text">
-              <string>&amp;New shortcut:</string>
-             </property>
-             <property name="buddy">
-              <cstring>editShortcut</cstring>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="Gui::AccelLineEdit" name="editShortcut"/>
-           </item>
-          </layout>
-         </item>
-         <item row="5" column="1" colspan="3">
-          <widget class="QLabel" name="textLabelAssigned">
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>20</height>
-            </size>
-           </property>
-           <property name="toolTip">
-            <string>This list shows commands having the same shortcut in the priority from high
-to low. If more than one command with the same shortcut are active at the
-same time. The one with the highest prioirty will be triggered.</string>
-           </property>
-           <property name="text">
-            <string>Shorcut priority list:</string>
-           </property>
-          </widget>
-         </item>
         </layout>
        </item>
        <item>
@@ -328,11 +328,12 @@ same time. The one with the highest prioirty will be triggered.</string>
   <tabstop>categoryBox</tabstop>
   <tabstop>commandTreeWidget</tabstop>
   <tabstop>accelLineEditShortcut</tabstop>
+  <tabstop>editShortcut</tabstop>
+  <tabstop>shortcutTimeout</tabstop>
   <tabstop>buttonAssign</tabstop>
   <tabstop>buttonClear</tabstop>
   <tabstop>buttonReset</tabstop>
   <tabstop>buttonResetAll</tabstop>
-  <tabstop>shortcutTimeout</tabstop>
   <tabstop>assignedTreeWidget</tabstop>
   <tabstop>buttonUp</tabstop>
   <tabstop>buttonDown</tabstop>
diff --git a/src/Gui/DlgToolbars.ui b/src/Gui/DlgToolbars.ui
index 8eebc76576..910985b748 100644
--- a/src/Gui/DlgToolbars.ui
+++ b/src/Gui/DlgToolbars.ui
@@ -42,6 +42,9 @@
        <item row="1" column="1">
         <widget class="QComboBox" name="categoryBox"/>
        </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QLineEdit" name="editCommand"/>
+       </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_4">
          <property name="sizePolicy">
@@ -55,9 +58,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="2">
-        <widget class="QLineEdit" name="editCommand"/>
-       </item>
        <item row="2" column="0" colspan="2">
         <widget class="QTreeWidget" name="commandTreeWidget">
          <property name="rootIsDecorated">
@@ -331,7 +331,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;/head&gt;&lt;body style=&quot; white-space: pre-wrap; font-family:MS Shell Dlg 2; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; The changes become active the next time you load the appropriate workbench&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;/head&gt;&lt;body style=&quot; white-space: pre-wrap; font-size:7.8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note:&lt;/span&gt; The changes become active the next time you load the appropriate workbench&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
    </item>
diff --git a/src/Gui/DlgToolbarsImp.cpp b/src/Gui/DlgToolbarsImp.cpp
index 1f1bbedf82..72c5b51ffa 100644
--- a/src/Gui/DlgToolbarsImp.cpp
+++ b/src/Gui/DlgToolbarsImp.cpp
@@ -209,7 +209,7 @@ void DlgCustomToolbars::importCustomToolbars(const QByteArray& name)
                     auto* item = new QTreeWidgetItem(toplevel);
                     item->setText(0, Action::commandMenuText(pCmd));
                     item->setToolTip(0, Action::commandToolTip(pCmd));
-                    item->setData(0, Qt::UserRole, QByteArray(it2->first.c_str()));
+                    item->setData(0, Qt::UserRole, QByteArray(it2.first.c_str()));
                     if (pCmd->getPixmap())
                         item->setIcon(0, BitmapFactory().iconFromTheme(pCmd->getPixmap()));
                     item->setSizeHint(0, QSize(32, 32));