diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
index 506f153717..acc567dbc4 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.addin
@@ -1,70 +1,74 @@
-<AddIn name="SharpDevelop Debugger" author="David Srbecký" copyright="GPL" url="" description="SharpDevelop Managed Debugger" version="0.1.0.0">
-    <Runtime>
-        <Import assembly="Debugger.AddIn.dll"/>
-    </Runtime>
+<AddIn name="SharpDevelop Debugger" author="David Srbecký" copyright="GPL" url="" description="SharpDevelop Managed Debugger" version="0.1.0.0">
+	<Runtime>
+		<Import assembly="Debugger.AddIn.dll"/>
+	</Runtime>
 
-    <Path name="/SharpDevelop/Services/DebuggerService/Debugger">
-        <Class id="DefaultDebugger" class="ICSharpCode.SharpDevelop.Services.WindowsDebugger"/>
-    </Path>
-
-    <!--<Path name = "/SharpDevelop/Workbench/MainMenu/View">
-        <MenuItem id = "Debugger" label = "${res:XML.MainMenu.ViewMenu.DebugMenu}">
-            <MenuItem id    = "DebugViewMenuBuilder" 
-                      type  = "Builder" 
-                      class = "ICSharpCode.SharpDevelop.Commands.DebugSelectionMenuBuilder" />
-        </MenuItem>
-    </Path>-->
-
-    <!--<Path name = "/SharpDevelop/Workbench/MainMenu/Debug">
-        <MenuItem id = "CatchHandledExceptionsSeparator"
+	<Path name="/SharpDevelop/Services/DebuggerService/Debugger">
+		<Class id="DefaultDebugger" class="ICSharpCode.SharpDevelop.Services.WindowsDebugger"/>
+	</Path>
+	
+	<Path name = "/SharpDevelop/Workbench/MainMenu/View">
+		<MenuItem id    = "Debugger"
+		          label = "${res:XML.MainMenu.ViewMenu.DebugMenu}"
+		          type  = "Menu"
+		          insertafter  = "Tools"
+		          insertbefore = "ViewItemsSeparator">
+			<MenuItem id    = "DebugViewMenuBuilder"
+			          type  = "Builder"
+			          class = "ICSharpCode.SharpDevelop.Commands.DebugViewMenuBuilder"/>
+		</MenuItem>
+	</Path>
+	
+	<!--<Path name = "/SharpDevelop/Workbench/MainMenu/Debug">
+		<MenuItem id = "CatchHandledExceptionsSeparator"
 		          type = "Separator"
 		          insertafter = "Step out" />
-        <MenuItem id = "CatchHandledExceptions"
+		<MenuItem id = "CatchHandledExceptions"
 		          label = ""
 		          class = "ICSharpCode.SharpDevelop.Services.DebbugerExceptionMenuBuilder"/>
-    </Path>-->
+	</Path>-->
 
     <Path name = "/SharpDevelop/Workbench/Pads">
         <Pad id    = "BreakPointsPad3" 
-		     category = "Main"
+		     category = "Debugger"
 		     title    = "Breakpoints"
 		     icon     = "PadIcons.ProjectBrowser"
 		     shortcut = "Control|Alt|B"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad"/>
 
         <Pad id    = "CallStackPad3" 
-		     category = "Main"
+		     category = "Debugger"
 		     title    = "Callstack"
 		     icon     = "PadIcons.ProjectBrowser"
 		     shortcut = "Control|Alt|C"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad"/>
 
         <Pad id    = "LoadedModulesPad3" 
-		     category = "Main"
+		     category = "Debugger"
 		     title    = "Loaded modules"
 		     icon     = "PadIcons.ProjectBrowser"
 		     shortcut = "Control|Alt|U"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad"/>
 
         <Pad id    = "RunningThreadsPad3"
-		     category = "Main"
+		     category = "Debugger"
 		     title    = "Threads"
 		     icon     = "PadIcons.ProjectBrowser"
 		     shortcut = "Control|Alt|H"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad"/>
 
         <Pad id    = "LocalVarPad3" 
-		     category = "Main"
+		     category = "Debugger"
 		     title    = "Local variables"
 		     icon     = "PadIcons.ProjectBrowser"
 		     shortcut = "Control|Alt|V"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad"/>
 
         <Pad id    = "ExceptionHistoryPad" 
-             category = "Main"
+             category = "Debugger"
              title    = "Exception history"
              icon     = "PadIcons.ProjectBrowser"
              shortcut = "Control|Alt|E"
              class = "ICSharpCode.SharpDevelop.Gui.Pads.ExceptionHistoryPad"/>
-        </Path>
+       </Path>
 </AddIn>
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
index d5192a5b6b..ccca107054 100644
--- a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Debugger.AddIn.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -48,6 +48,7 @@
     <EmbeddedResource Include="Src\Service\ExceptionForm.resx">
       <DependentUpon>ExceptionForm.cs</DependentUpon>
     </EmbeddedResource>
+    <Compile Include="Src\Pads\ViewMenuItemBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
diff --git a/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ViewMenuItemBuilder.cs b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ViewMenuItemBuilder.cs
new file mode 100644
index 0000000000..a78283fe03
--- /dev/null
+++ b/src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/ViewMenuItemBuilder.cs
@@ -0,0 +1,17 @@
+// <file>
+//     <owner name="Daneiel Grunwald" email="daniel@danielgrunwald.de"/>
+// </file>
+
+using System;
+
+namespace ICSharpCode.SharpDevelop.Commands
+{
+	public class DebugViewMenuBuilder : ViewMenuBuilder
+	{
+		protected override string Category {
+			get {
+				return "Debugger";
+			}
+		}
+	}
+}
diff --git a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
index 7e721c6c50..08bbbf2c30 100644
--- a/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
+++ b/src/Main/Base/Project/Src/Commands/MenuItemBuilders.cs
@@ -316,15 +316,6 @@ namespace ICSharpCode.SharpDevelop.Commands
 //		}
 //	}
 	
-	public class DebugViewMenuBuilder : ViewMenuBuilder
-	{
-		protected override string Category {
-			get {
-				return "Debugger";
-			}
-		}
-	}
-	
 	public class ToolsViewMenuBuilder : ViewMenuBuilder
 	{
 		protected override string Category {