diff --git a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
index 7f0bb1f0a1..1c6a2d7b2c 100644
--- a/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
+++ b/src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj
@@ -145,7 +145,6 @@
     <Compile Include="Src\SharpDevelopProjectSystem.cs" />
     <Compile Include="Src\SharpDevelopProjectSystemFactory.cs" />
     <Compile Include="Src\StringToStringCollectionConverter.cs" />
-    <Compile Include="Src\TextBoxBehaviour.cs" />
     <Compile Include="Src\ViewModelBase.cs" />
     <Compile Include="Src\ViewModelLocator.cs" />
   </ItemGroup>
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml
index 33ce560706..f4417e261c 100644
--- a/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml
+++ b/src/AddIns/Misc/PackageManagement/Project/Src/PackagesView.xaml
@@ -285,8 +285,13 @@
 				<TextBox
 					Grid.Row="1"
 					Grid.Column="0"
-					pm:TextBoxBehaviour.EnterKeyCommand="{Binding Path=SearchCommand}"
-					Text="{Binding Path=SearchTerms, UpdateSourceTrigger=PropertyChanged}"/>
+					Text="{Binding Path=SearchTerms, UpdateSourceTrigger=PropertyChanged}">
+					<TextBox.InputBindings>
+						<KeyBinding
+							Key="Enter"
+							Command="{Binding Path=SearchCommand}"/>
+					</TextBox.InputBindings>
+				</TextBox>
 				<TextBlock 
 					Grid.Row="1"
 					Grid.Column="1"
diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/TextBoxBehaviour.cs b/src/AddIns/Misc/PackageManagement/Project/Src/TextBoxBehaviour.cs
deleted file mode 100644
index 59e5de6beb..0000000000
--- a/src/AddIns/Misc/PackageManagement/Project/Src/TextBoxBehaviour.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace ICSharpCode.PackageManagement
-{
-	public static class TextBoxBehaviour
-	{
-		public static readonly DependencyProperty EnterKeyCommandProperty
-			= DependencyProperty.RegisterAttached(
-				"EnterKeyCommand",
-				typeof(ICommand),
-				typeof(TextBoxBehaviour),
-				new FrameworkPropertyMetadata(null, OnEnterKeyCommandPropertyChanged));
-		
-		public static ICommand GetEnterKeyCommand(DependencyObject dependencyObject)
-		{
-			return dependencyObject.GetValue(EnterKeyCommandProperty) as ICommand;
-		}
-		
-		public static void SetEnterKeyCommand(DependencyObject dependencyObject, ICommand command)
-		{
-			dependencyObject.SetValue(EnterKeyCommandProperty, command);
-		}
-		
-		static void OnEnterKeyCommandPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-		{
-			TextBox textBox = dependencyObject as TextBox;
-			if (textBox == null) {
-				return;
-			}
-			
-			ICommand command = e.NewValue as ICommand;
-			if (command == null) {
-				textBox.KeyDown -= TextBoxKeyDown;
-			} else {
-				textBox.KeyDown += TextBoxKeyDown;
-			}
-		}
-
-		static void TextBoxKeyDown(object sender, KeyEventArgs e)
-		{
-			TextBox textBox = sender as TextBox;
-			if (textBox == null) {
-				return;
-			}
-			
-			if (e.Key == Key.Enter) {
-				ICommand command = GetEnterKeyCommand(textBox);
-				if (command != null) {
-					command.Execute(null);
-				}
-			}
-		}
-	}
-}