diff --git a/freecad/kiconnect/commands/cmd_edit_prefs.py b/freecad/kiconnect/commands/cmd_edit_prefs.py
new file mode 100644
index 0000000..8f7c7a4
--- /dev/null
+++ b/freecad/kiconnect/commands/cmd_edit_prefs.py
@@ -0,0 +1,24 @@
+import importlib
+import FreeCADGui as Gui
+import os
+import sys
+
+from .. import settings
+from ..project import Project
+
+class EditPrefs:
+    def GetResources(self):
+        tooltip  = '<p>EditPrefs KiConnect Workbench for development.\nNOTE: Does not reload toolbars.</p>'
+        iconFile = 'preferences-system.svg'
+
+        return {
+            'MenuText': 'Edit Preferences',
+            'ToolTip': tooltip,
+            'Pixmap' : iconFile
+        }
+
+    def Activated(self):
+        Gui.showPreferences("KiConnect")
+
+
+Gui.addCommand('cmd_edit_prefs', EditPrefs())
diff --git a/freecad/kiconnect/init_gui.py b/freecad/kiconnect/init_gui.py
index 8ea61c6..16225cb 100644
--- a/freecad/kiconnect/init_gui.py
+++ b/freecad/kiconnect/init_gui.py
@@ -7,7 +7,7 @@ sys.path.insert(1, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..
 import FreeCADGui as Gui
 import FreeCAD as App
 
-from .commands import cmd_new_pcb, cmd_reload, cmd_sync_from, cmd_sync_to
+from .commands import cmd_edit_prefs, cmd_new_pcb, cmd_reload, cmd_sync_from, cmd_sync_to
 from . import settings
 
 translate=App.Qt.translate
@@ -51,6 +51,9 @@ class KiConnect(Gui.Workbench):
         if settings.preferences.GetBool('debug_reload'):
             self.toolbox.append('kiconn_reload')
 
+        if settings.preferences.GetBool('prefs_toolbar'):
+            self.toolbox.append('cmd_edit_prefs')
+
         print('setting up toolbar')
         # NOTE: Context for this commands must be "Workbench"
         self.appendToolbar(QT_TRANSLATE_NOOP("Workbench", "KiConnect"), self.toolbox)