diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index e08db5d123..b34ff02ce8 100755
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -72,7 +72,6 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ProjectScoutLabel}"
 		     icon     = "PadIcons.ProjectBrowser"
-		     shortcut = "Control|Alt|L"
 		     class    = "ICSharpCode.SharpDevelop.Project.ProjectBrowserPad"
 		     defaultPosition = "Left" />
 		
@@ -80,7 +79,6 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ClassScoutLabel}"
 		     icon     = "PadIcons.ClassBrowser"
-		     shortcut = "Control|Shift|C"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad"
 		     defaultPosition = "Right" />
 		
@@ -88,7 +86,6 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ToolbarLabel}"
 		     icon     = "PadIcons.Toolbar"
-		     shortcut = "Control|Alt|X"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ToolsPad"
 		     defaultPosition = "Left" />
 		
@@ -102,7 +99,6 @@
 		<Pad id       = "ErrorList"
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.ErrorList}"
-		     shortcut = "Control|Alt|K"
 		     icon     = "PadIcons.ErrorList"
 		     class    = "ICSharpCode.SharpDevelop.Gui.ErrorListPad"
 		     defaultPosition = "Bottom" />
@@ -118,7 +114,6 @@
 		     category = "Main"
 		     title    = "${res:MainWindow.Windows.OutputWindow}"
 		     icon     = "PadIcons.Output"
-		     shortcut = "Control|Alt|O"
 		     class    = "ICSharpCode.SharpDevelop.Gui.CompilerMessageView"
 		     defaultPosition = "Bottom" />
 		
@@ -134,7 +129,6 @@
 		     category = "Tools"
 		     title    = "${res:MainWindow.Windows.FileScoutLabel}"
 		     icon     = "PadIcons.FileBrowser"
-		     shortcut = "Control|Alt|F"
 		     class    = "ICSharpCode.SharpDevelop.Gui.FileScout"
 		     defaultPosition = "Left, Hidden" />
 		
@@ -1486,7 +1480,6 @@
 					<MenuItem id       = "Break"
 					          label    = "${res:XML.MainMenu.DebugMenu.Break}"
 					          icon     = "Icons.16x16.Debug.Break"
-					          shortcut = "Control|Alt|B"
 					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BreakDebuggingCommand"/>
 				</Condition>
 				<Condition name="IsProcessRunning" isprocessrunning = "False" isdebugging = "True" action = "Disable">
diff --git a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin
index 0cf47f1249..7b2ab73202 100644
--- a/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin
+++ b/src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin
@@ -20,7 +20,6 @@
 		     insertafter  = "Bookmarks"
 		     insertbefore = "DefinitionView"
 		     icon         = "CodeCoverage.Icons.16x16.Pad"
-		     shortcut     = "Control|Alt|G"
 		     class        = "ICSharpCode.CodeCoverage.CodeCoveragePad"
 		     defaultPosition = "Bottom, Hidden" />
 	</Path>
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.addin b/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
index 0c32fe92dc..aa4ab95bed 100644
--- a/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
+++ b/src/AddIns/Analysis/UnitTesting/UnitTesting.addin
@@ -28,7 +28,6 @@
 			category="Tools"
 			title="${res:ICSharpCode.NUnitPad.NUnitPadContent.PadName}"
 			icon="PadIcons.NUnitTest"
-			shortcut="Control|Alt|T"
 			class="ICSharpCode.UnitTesting.UnitTestsPad"
 			defaultPosition="Right, Hidden" />
 	</Path>
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
index d9056d6151..57f73b20f5 100644
--- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
+++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.addin
@@ -72,7 +72,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Breakpoints}"
 		     icon     = "PadIcons.BreakPoints"
-		     shortcut = "Control|Alt|P"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.BreakPointsPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -80,7 +79,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.CallStack}"
 		     icon     = "PadIcons.CallStack"
-		     shortcut = "Control|Alt|C"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.CallStackPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -88,7 +86,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Modules}"
 		     icon     = "PadIcons.LoadedModules"
-		     shortcut = "Control|Alt|U"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -96,7 +93,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Threads}"
 		     icon     = "PadIcons.Threads"
-		     shortcut = "Control|Alt|H"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -104,7 +100,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.LocalVariables}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|V"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -112,7 +107,6 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Console}"
 		     icon     = "PadIcons.Output"
-		     shortcut = "Control|Alt|N"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.ConsolePad"
 		     defaultPosition = "Bottom, Hidden" />
 		
@@ -120,18 +114,15 @@
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.Watch}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|W"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.WatchPad"
 		     defaultPosition = "Bottom, Hidden" />
-	  <!-- Hidden until DebuggerPad.IsVisible bug is fixed
+		
 		<Pad id    = "ObjectGraphPad"
 		     category = "Debugger"
 		     title    = "${res:MainWindow.Windows.Debug.ObjectGraph}"
 		     icon     = "PadIcons.LocalVariables"
-		     shortcut = "Control|Alt|O"
 		     class = "ICSharpCode.SharpDevelop.Gui.Pads.ObjectGraphPad"
 		     defaultPosition = "Bottom, Hidden" />
-      -->
 	</Path>
 	
 	<Path name ="/SharpDevelop/Pads/WatchPad/ContextMenu">
diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
index ce3dc17915..f149fca6d3 100644
--- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
+++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Addin/ICSharpCode.Data.addin
@@ -30,7 +30,6 @@
           icon="Icons.16x16.SharpQuery.Refresh"
           category="Tools"
           title="DatabaseExplorer"
-          shortcut="Control|Alt|D"
 		   defaultPosition = "Right, Hidden"
           class="ICSharpCode.Data.Addin.Pad.DatabasesTreeViewPad" />
   </Path>