diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
index 0b97bff64d..56b671b5d6 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonPadContent.cs
@@ -92,13 +92,13 @@ namespace ICSharpCode.SharpDevelop.Gui
 					CommandsRegistry.LoadContext(contextName, (UIElement)Content);
 					
 					CommandsRegistry.RegisterCommandBindingsUpdateHandler(contextName, delegate {
-					                                                      	var bindings = CommandsRegistry.GetCommandBindings(contextName);
+					                                                      	var bindings = CommandsRegistry.GetCommandBindings(contextName, null, null);
 					                                                      	CommandsRegistry.RemoveManagedCommandBindings(CommandBindings);
 					                                                      	CommandBindings.AddRange(bindings);
 					                                                      });
 					
 					CommandsRegistry.RegisterInputBindingUpdateHandler(contextName, delegate {
-					                                                   	var bindings = CommandsRegistry.GetInputBindings(contextName);
+					                                                   	var bindings = CommandsRegistry.GetInputBindings(contextName, null, null);
 					                                                   	CommandsRegistry.RemoveManagedInputBindings(InputBindings);
 					                                                   	InputBindings.AddRange(bindings);
 					                                                   });
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
index 5af19cdfac..59accd323f 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/AvalonWorkbenchWindow.cs
@@ -102,7 +102,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				CommandsRegistry.RegisterCommandBindingsUpdateHandler(
 					contextName,
 					delegate {
-						var bindings = CommandsRegistry.GetCommandBindings(contextName);
+						var bindings = CommandsRegistry.GetCommandBindings(contextName, null, null);
 						CommandsRegistry.RemoveManagedCommandBindings(CommandBindings);
 						CommandBindings.AddRange(bindings);
 					});
@@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 				CommandsRegistry.RegisterInputBindingUpdateHandler(
 					contextName,
 					delegate {
-						var bindings = CommandsRegistry.GetInputBindings(contextName);
+						var bindings = CommandsRegistry.GetInputBindings(contextName, null, null);
 						CommandsRegistry.RemoveManagedInputBindings(InputBindings);
 						InputBindings.AddRange(bindings);
 					});