diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 471ffea74f..79b69bb5b8 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -388,12 +388,23 @@ class DraftToolBar:
             self.draftWidget = QtGui.QDockWidget()
             self.baseWidget = DraftDockWidget()
             self.draftWidget.setObjectName("draftToolbar")
-            self.draftWidget.setTitleBarWidget(self.baseWidget)
+            self.scroll = QtGui.QScrollArea()
+            self.scroll.setWidgetResizable(True)
+            self.scroll.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+            self.scroll.setWidget(self.baseWidget)
+            self.draftWidget.setTitleBarWidget(self.scroll)
+            p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
+            size = p.GetInt("ToolbarIconSize", 24)
+            if size < 24:
+                scale = 3.5
+            else:
+                scale = 2.5
+            self.scroll.setMinimumHeight(size * scale)
             self.draftWidget.setWindowTitle(translate("draft", "Draft Command Bar"))
             self.mw = FreeCADGui.getMainWindow()
             self.mw.addDockWidget(QtCore.Qt.TopDockWidgetArea,self.draftWidget)
             self.draftWidget.setVisible(False)
-            self.draftWidget.toggleViewAction().setVisible(False)                               
+            self.draftWidget.toggleViewAction().setVisible(False)
             self.baseWidget.setObjectName("draftToolbar")
             self.layout = QtGui.QHBoxLayout(self.baseWidget)
             self.layout.setObjectName("layout")
@@ -403,7 +414,7 @@ class DraftToolBar:
             self.setupTray()
             self.setupStyle()
             self.retranslateUi(self.baseWidget)
-		
+
 #---------------------------------------------------------------------------
 # General UI setup
 #---------------------------------------------------------------------------