diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 67b3006e7c..55b9ef4b7d 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1278,6 +1278,7 @@
 			          class = "ICSharpCode.SharpDevelop.Commands.TabStrip.CopyPathName"/>
 			<MenuItem id = "NavigateToFileInProjectBrowser"
 			          label = "${res:ICSharpCode.SharpDevelop.Commands.TabStrip.NavigateToFileInProjectBrowser}"
+								shortcut = "Alt|Shift|L"
 			          class = "ICSharpCode.SharpDevelop.Commands.TabStrip.NavigateToFileInProjectBrowser"/>
 			<MenuItem id = "OpenFolderContainingFileFromTab"
 			          label = "${res:OpenFileTabEventHandler.FileContainingFolderInExplorer}"
diff --git a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
index 8893cf6bee..692fbbcb26 100644
--- a/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
+++ b/src/Main/Base/Project/Src/Commands/FileTabStripCommands.cs
@@ -105,9 +105,16 @@ namespace ICSharpCode.SharpDevelop.Commands.TabStrip
 		
 		string GetActiveFileName()
 		{
-			if ((this.Owner is IWorkbenchWindow) && (((IWorkbenchWindow)this.Owner).ActiveViewContent != null)) {
-				return (Owner as IWorkbenchWindow).ActiveViewContent.PrimaryFileName;
+			var workbenchWindow = Owner as IWorkbenchWindow;
+			if (workbenchWindow == null)
+				workbenchWindow = SD.Workbench.ActiveWorkbenchWindow;
+
+			if (workbenchWindow != null &&
+				workbenchWindow.ActiveViewContent != null)
+			{
+				return workbenchWindow.ActiveViewContent.PrimaryFileName;
 			}
+
 			return null;
 		}
 		
diff --git a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
index 2574b52af3..da68bc4ffa 100644
--- a/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
+++ b/src/Main/ICSharpCode.Core.Presentation/Menu/MenuService.cs
@@ -114,12 +114,32 @@ namespace ICSharpCode.Core.Presentation
 		
 		public static ContextMenu CreateContextMenu(object owner, string addInTreePath)
 		{
-			IList items = CreateUnexpandedMenuItems(
+			return CreateContextMenu(
 				new MenuCreateContext { ActivationMethod = "ContextMenu" },
+				owner,
+				addInTreePath);
+		}
+
+		public static ContextMenu CreateContextMenu(UIElement inputBindingOwner, object owner, string addInTreePath)
+		{
+			return CreateContextMenu(
+				new MenuCreateContext
+				{
+					InputBindingOwner = inputBindingOwner,
+					ActivationMethod = "ContextMenu"
+				},
+				owner,
+				addInTreePath);
+		}
+
+		private static ContextMenu CreateContextMenu(MenuCreateContext context, object owner, string addInTreePath)
+		{
+			IList items = CreateUnexpandedMenuItems(
+				context,
 				AddInTree.BuildItems<MenuItemDescriptor>(addInTreePath, owner, false));
 			return CreateContextMenu(items);
 		}
-		
+	
 		public static ContextMenu ShowContextMenu(UIElement parent, object owner, string addInTreePath)
 		{
 			ContextMenu menu = new ContextMenu();
diff --git a/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs b/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs
index f38e61ea19..6cf28f9192 100644
--- a/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs
+++ b/src/Main/SharpDevelop/Workbench/AvalonWorkbenchWindow.cs
@@ -293,7 +293,7 @@ namespace ICSharpCode.SharpDevelop.Workbench
 			base.OnApplyTemplate();
 			
 			if (this.DragEnabledArea != null) {
-				this.DragEnabledArea.ContextMenu = MenuService.CreateContextMenu(this, contextMenuPath);
+				this.DragEnabledArea.ContextMenu = MenuService.CreateContextMenu(this, this, contextMenuPath);
 				UpdateInfoTip(); // set tooltip
 			}
 		}