diff --git a/src/apps/terminal/FindWindow.cpp b/src/apps/terminal/FindWindow.cpp
index 5069ad9745..c91fdc7e59 100644
--- a/src/apps/terminal/FindWindow.cpp
+++ b/src/apps/terminal/FindWindow.cpp
@@ -21,7 +21,9 @@ const uint32 MSG_FIND_HIDE = 'Fhid';
 
 FindWindow::FindWindow (BRect frame, BMessenger messenger , BString &str,
 	bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
-	: BWindow(frame, "Find", B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
+	:
+	BWindow(frame, "Find", B_FLOATING_WINDOW,
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE),
 	fFindDlgMessenger(messenger)
 {
 	AddShortcut((ulong)'W', (ulong)B_COMMAND_KEY, new BMessage(MSG_FIND_HIDE));
@@ -138,23 +140,6 @@ FindWindow::MessageReceived(BMessage *msg)
 }
 
 
-void
-FindWindow::DispatchMessage(BMessage *message, BHandler *handler)
-{
-	if (message->what == B_KEY_DOWN) {
-		int8 key;
-		if (message->FindInt8("byte", 0, &key) == B_OK) {
-			if (key == B_ESCAPE) {
-				message->MakeEmpty();
-				message->what = B_QUIT_REQUESTED;
-			}
-		}
-	}
-
-	BWindow::DispatchMessage(message, handler);
-}
-
-
 void
 FindWindow::Quit()
 {
diff --git a/src/apps/terminal/FindWindow.h b/src/apps/terminal/FindWindow.h
index 2056adb7cd..cbdb3d61aa 100644
--- a/src/apps/terminal/FindWindow.h
+++ b/src/apps/terminal/FindWindow.h
@@ -29,7 +29,6 @@ class FindWindow : public BWindow {
 
 		virtual void Quit();
 		virtual void MessageReceived(BMessage *msg);
-		virtual void DispatchMessage(BMessage* message, BHandler* handler);
 
 	private:
 		void _SendFindMessage();