diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 22cdcb19e3..143b62e1bb 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1388,7 +1388,7 @@
 					<MenuItem id = "Separator1" type = "Separator" />
 					<MenuItem id       = "Build project"
 					          label    = "${res:XML.MainMenu.BuildMenu.BuildProject}"
-					          shortcut = "Control|F8"
+					          shortcut = "F9"
 					          icon     = "Icons.16x16.BuildCurrentSelectedProject"
 					          class    = "ICSharpCode.SharpDevelop.Project.Commands.BuildProject"/>
 					<MenuItem id       = "Rebuild project"
@@ -1433,7 +1433,7 @@
 						          label    = "${res:XML.MainMenu.RunMenu.Run}"
 						          icon     = "Icons.16x16.RunProgramIcon"
 						          shortcut = "F5"
-						          class    = "ICSharpCode.SharpDevelop.Project.Commands.Execute"/>
+						          class    = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"/>
 					</Condition>
 				</Condition>
 			</Condition>
@@ -1488,7 +1488,7 @@
 					<MenuItem id       = "Continue"
 					          label    = "${res:XML.MainMenu.DebugMenu.Continue}"
 					          icon     = "Icons.16x16.Debug.Continue"
-					          shortcut = "F6"
+					          shortcut = "F5"
 					          class    = "ICSharpCode.SharpDevelop.Project.Commands.ContinueDebuggingCommand"/>
 				</Condition>
 			</Condition>
@@ -1571,7 +1571,7 @@
 			
 			<MenuItem id = "FindDerivedOrOverridesClasses"
 			          label = "${res:SharpDevelop.Refactoring.FindDerivedClassesOrOverridesCommand}"
-			          shortcut = "F9"
+			          shortcut = "F6"
 			          icon="Icons.16x16.Class"
 			          class = "ICSharpCode.SharpDevelop.Editor.Commands.FindDerivedClassesOrOverrides"/>
 			
diff --git a/src/Main/Base/Project/Src/Commands/DebugCommands.cs b/src/Main/Base/Project/Src/Commands/DebugCommands.cs
index 035f5dd5e5..947eb13040 100644
--- a/src/Main/Base/Project/Src/Commands/DebugCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/DebugCommands.cs
@@ -47,8 +47,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 	{
 		public override void Run()
 		{
-			LoggingService.Info("Debugger Command: Continue");
-			DebuggerService.CurrentDebugger.Continue();
+			if (DebuggerService.CurrentDebugger.IsDebugging) {
+				LoggingService.Info("Debugger Command: Continue");
+				DebuggerService.CurrentDebugger.Continue();
+			} else {
+				LoggingService.Info("Debugger Command: Run");
+				new Execute().Run();
+			}
 		}
 	}
 	
@@ -118,7 +123,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		{
 			DebuggerService.CurrentDebugger.ShowAttachDialog();
 		}
-	}	
+	}
 	
 	public class DetachFromProcessCommand : AbstractMenuCommand
 	{
@@ -126,5 +131,5 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		{
 			DebuggerService.CurrentDebugger.Detach();
 		}
-	}	
+	}
 }
diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
index 59b4c267f4..bfddcbe5af 100644
--- a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
+++ b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
@@ -193,7 +193,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 				return null;
 			var item = new MenuItem { Header = MenuService.ConvertLabel(StringParser.Parse("${res:SharpDevelop.Refactoring.FindDerivedClassesCommand}")) };
 			item.Icon = ClassBrowserIconService.Class.CreateImage();
-			item.InputGestureText = new KeyGesture(Key.F9).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
+			item.InputGestureText = new KeyGesture(Key.F6).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 			item.Click += delegate {
 				ContextActionsHelper.MakePopupWithDerivedClasses(baseClass).OpenAtCaretAndFocus(context.Editor);
 			};
@@ -219,7 +219,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
 				return null;
 			var item = new MenuItem { Header = MenuService.ConvertLabel(StringParser.Parse("${res:SharpDevelop.Refactoring.FindOverridesCommand}")) };
 			item.Icon = ClassBrowserIconService.Method.CreateImage();
-			item.InputGestureText = new KeyGesture(Key.F9).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
+			item.InputGestureText = new KeyGesture(Key.F6).GetDisplayStringForCulture(Thread.CurrentThread.CurrentUICulture);
 			item.Click += delegate {
 				ContextActionsHelper.MakePopupWithOverrides(member).OpenAtCaretAndFocus(context.Editor);
 			};