diff --git a/Source/BuilderModes/Interface/FindReplaceForm.Designer.cs b/Source/BuilderModes/Interface/FindReplaceForm.Designer.cs
index 9dce6392..d0c9da52 100644
--- a/Source/BuilderModes/Interface/FindReplaceForm.Designer.cs
+++ b/Source/BuilderModes/Interface/FindReplaceForm.Designer.cs
@@ -166,6 +166,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.closebutton.TabIndex = 8;
 			this.closebutton.Text = "Close";
 			this.closebutton.UseVisualStyleBackColor = true;
+			this.closebutton.Click += new System.EventHandler(this.closebutton_Click);
 			// 
 			// resultslist
 			// 
@@ -253,6 +254,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.ShowInTaskbar = false;
 			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
 			this.Text = "Find and Replace";
+			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FindReplaceForm_FormClosing);
 			this.resultspanel.ResumeLayout(false);
 			this.resultspanel.PerformLayout();
 			this.groupreplace.ResumeLayout(false);
diff --git a/Source/BuilderModes/Interface/FindReplaceForm.cs b/Source/BuilderModes/Interface/FindReplaceForm.cs
index f70c5747..a34baa00 100644
--- a/Source/BuilderModes/Interface/FindReplaceForm.cs
+++ b/Source/BuilderModes/Interface/FindReplaceForm.cs
@@ -206,6 +206,23 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			}
 		}
 
+		// Window closing
+		private void FindReplaceForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			// If the user closes the form, then just cancel the mode
+			if(e.CloseReason == CloseReason.UserClosing)
+			{
+				e.Cancel = true;
+				General.Map.CancelMode();
+			}
+		}
+
+		// Close button clicked
+		private void closebutton_Click(object sender, EventArgs e)
+		{
+			General.Map.CancelMode();
+		}
+
 		#endregion
 
 		#region ================== Methods