diff --git a/src/apps/diskprobe/FindWindow.cpp b/src/apps/diskprobe/FindWindow.cpp
index 719acd9903..b5df9dec63 100644
--- a/src/apps/diskprobe/FindWindow.cpp
+++ b/src/apps/diskprobe/FindWindow.cpp
@@ -482,7 +482,8 @@ FindTextView::GetData(BMessage& message)
 
 FindWindow::FindWindow(BRect _rect, BMessage& previous, BMessenger& target,
 		const BMessage* settings)
-	: BWindow(_rect, "Find", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS),
+	: BWindow(_rect, "Find", B_TITLED_WINDOW,
+		B_ASYNCHRONOUS_CONTROLS | B_CLOSE_ON_ESCAPE),
 	fTarget(target)
 {
 	BView* view = new BView(Bounds(), "main", B_FOLLOW_ALL, 0);