diff --git a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs
index f4011c0ee6..283bdef3e8 100644
--- a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs
+++ b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Engine/SearchReplaceManager.cs
@@ -27,12 +27,7 @@ namespace SearchAndReplace
 		static SearchReplaceManager()
 		{
 			find.TextIteratorBuilder = new ForwardTextIteratorBuilder();
-//			SearchOptions.SearchStrategyTypeChanged   += new EventHandler(InitializeSearchStrategy);
-//			SearchOptions.DocumentIteratorTypeChanged += new EventHandler(InitializeDocumentIterator);
-//			InitializeDocumentIterator(null, null);
-//			InitializeSearchStrategy(null, null);
-		}	
-		
+		}
 		
 		static void SetSearchOptions()
 		{
diff --git a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
index 6d9782096c..8a747ed15c 100644
--- a/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
+++ b/src/Main/Base/Project/Src/TextEditor/SearchAndReplace/Gui/SearchAndReplacePanel.cs
@@ -21,9 +21,6 @@ using ICSharpCode.TextEditor;
 
 namespace SearchAndReplace
 {
-	/// <summary>
-	/// Description of SearchAndReplacePanel.
-	/// </summary>
 	public class SearchAndReplacePanel : BaseSharpDevelopUserControl
 	{
 		SearchAndReplaceMode  searchAndReplaceMode;
@@ -43,6 +40,8 @@ namespace SearchAndReplace
 						break;
 					case SearchAndReplaceMode.Replace:
 						SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.ReplacePanel.xfrm"));
+						Get<Button>("replace").Click += new EventHandler(ReplaceButtonClicked);
+						Get<Button>("replaceAll").Click += new EventHandler(ReplaceAllButtonClicked);
 						break;
 				}
 				
@@ -68,6 +67,18 @@ namespace SearchAndReplace
 			SearchReplaceInFilesManager.FindAll();
 		}
 		
+		void ReplaceAllButtonClicked(object sender, EventArgs e)
+		{
+			WritebackOptions();
+			SearchReplaceManager.ReplaceAll();
+		}
+		
+		void ReplaceButtonClicked(object sender, EventArgs e)
+		{
+			WritebackOptions();
+			SearchReplaceManager.Replace();
+		}
+		
 		void WritebackOptions()
 		{
 			SearchOptions.FindPattern = Get<ComboBox>("find").Text;