diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp
index e4587eb9c1..423c561ef8 100644
--- a/src/Mod/TechDraw/Gui/Workbench.cpp
+++ b/src/Mod/TechDraw/Gui/Workbench.cpp
@@ -47,17 +47,41 @@ Gui::MenuItem* Workbench::setupMenuBar() const
 {
     Gui::MenuItem* root = StdWorkbench::setupMenuBar();
     Gui::MenuItem* item = root->findItem("&Windows");
-
     Gui::MenuItem* draw = new Gui::MenuItem;
     root->insertItem(item, draw);
-    draw->setCommand("TechDraw");
+
+	// dimensions
+	Gui::MenuItem* dimensions = new Gui::MenuItem;
+	dimensions->setCommand("Dimensions");
+	*dimensions << "TechDraw_NewLengthDimension" << "TechDraw_NewDistanceXDimension" << "TechDraw_NewDistanceYDimension"
+		<< "TechDraw_NewRadiusDimension" << "TechDraw_NewDiameterDimension" << "TechDraw_NewAngleDimension"
+		<< "TechDraw_HorizontalExtent" << "TechDraw_VerticalExtent" << "TechDraw_LinkDimension";
+
+	// annotations
+	Gui::MenuItem* annotations = new Gui::MenuItem;
+	annotations->setCommand("Annotations");
+	*annotations << "TechDraw_Annotation" << "TechDraw_RichAnno" << "TechDraw_NewBalloon";
+
+	// lines
+	Gui::MenuItem* lines = new Gui::MenuItem;
+	lines->setCommand("Add Lines");
+	*lines << "TechDraw_LeaderLine" << "TechDraw_FaceCenterLine"
+		<< "TechDraw_2LineCenterLine" << "TechDraw_2PointCenterLine";
+
+	// vertices
+	Gui::MenuItem* vertices = new Gui::MenuItem;
+	vertices->setCommand("Add Vertices");
+	*vertices << "TechDraw_CosmeticVertex" << "TechDraw_Midpoints"
+		<< "TechDraw_Quadrant";
+
+	// main menu
+	draw->setCommand("TechDraw");
     *draw << "TechDraw_NewPageDef";
     *draw << "TechDraw_NewPage";
     *draw << "TechDraw_Redraw";
     *draw << "Separator";
     *draw << "TechDraw_NewView";
     *draw << "TechDraw_NewActiveView";
-//    *draw << "TechDraw_NewMulti";     //deprecated
     *draw << "TechDraw_ProjGroup";
     *draw << "TechDraw_NewViewSection";
     *draw << "TechDraw_NewViewDetail";
@@ -70,16 +94,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     *draw << "TechDraw_ClipPlus";
     *draw << "TechDraw_ClipMinus";
     *draw << "Separator";
-    *draw << "TechDraw_NewLengthDimension";
-    *draw << "TechDraw_NewDistanceXDimension";
-    *draw << "TechDraw_NewDistanceYDimension";
-    *draw << "TechDraw_NewRadiusDimension";
-    *draw << "TechDraw_NewDiameterDimension";
-    *draw << "TechDraw_NewAngleDimension";
-    *draw << "TechDraw_HorizontalExtent";
-    *draw << "TechDraw_VerticalExtent";
-    *draw << "TechDraw_LinkDimension";
-    *draw << "TechDraw_NewBalloon";
+	*draw << dimensions;
     *draw << "Separator";
     *draw << "TechDraw_ExportPage";
     *draw << "TechDraw_ExportPageDxf";
@@ -90,15 +105,9 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     *draw << "TechDraw_Image";
     *draw << "TechDraw_ToggleFrame";
     *draw << "Separator";
-    *draw << "TechDraw_Annotation";
-    *draw << "TechDraw_LeaderLine";
-    *draw << "TechDraw_RichAnno";
-    *draw << "TechDraw_CosmeticVertex";
-    *draw << "TechDraw_Midpoints";
-    *draw << "TechDraw_Quadrant";
-    *draw << "TechDraw_FaceCenterLine";
-    *draw << "TechDraw_2LineCenterLine";
-    *draw << "TechDraw_2PointCenterLine";
+    *draw << annotations;
+	*draw << lines;
+    *draw << vertices;
     *draw << "TechDraw_CosmeticEraser";
     *draw << "TechDraw_DecorateLine";
     *draw << "TechDraw_ShowAll";