diff --git a/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp b/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp
index f563da005b..9dcd415757 100644
--- a/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp
+++ b/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp
@@ -54,7 +54,8 @@ SelectPrinterDialog::SelectPrinterDialog(GPData* data)
 	:
 	DialogWindow(BRect(100, 100, 500, 500),
 		"Select Printer", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-		B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS),
+		B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+			| B_CLOSE_ON_ESCAPE),
 	fData(data)
 {
 	SetResult(B_ERROR);
diff --git a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
index d842eeb6e6..ab12247207 100644
--- a/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/AdvancedSettingsWindow.cpp
@@ -54,7 +54,7 @@ static BMessage* BorderWidthMessage(uint32 what, float width)
 AdvancedSettingsWindow::AdvancedSettingsWindow(BMessage *settings)
 	: HWindow(BRect(0, 0, 450, 180), "Advanced Settings", B_TITLED_WINDOW_LOOK,
 		B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_MINIMIZABLE |
-		B_NOT_ZOOMABLE),
+		B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE),
 	 fSettings(settings)
 {
 	AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
diff --git a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
index 714061367b..393ead67e9 100644
--- a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
@@ -51,7 +51,7 @@ THE SOFTWARE.
 
 DocInfoWindow::DocInfoWindow(BMessage *docInfo)
 	: HWindow(BRect(0, 0, 400, 250), "Document Information", B_TITLED_WINDOW_LOOK,
-		B_MODAL_APP_WINDOW_FEEL, B_NOT_MINIMIZABLE),
+		B_MODAL_APP_WINDOW_FEEL, B_NOT_MINIMIZABLE | B_CLOSE_ON_ESCAPE),
 	fDocInfo(docInfo)
 {
 	BRect bounds(Bounds());
diff --git a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
index 4cdffcbfea..ff61a0a0da 100644
--- a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
@@ -108,7 +108,7 @@ DragListView::InitiateDrag(BPoint point, int32 index, bool wasSelected)
 FontsWindow::FontsWindow(Fonts *fonts)
 	:	HWindow(BRect(0,0,400,220), "Fonts", B_TITLED_WINDOW_LOOK,
  			B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_MINIMIZABLE |
- 			B_NOT_ZOOMABLE)
+ 			B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE)
 {
 	// ---- Ok, build a default page setup user interface
 	BRect		r, r1;
diff --git a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
index d200d45baa..a8023b66d7 100644
--- a/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/JobSetupWindow.cpp
@@ -57,7 +57,7 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char * printerName)
 			B_TITLED_WINDOW_LOOK,
 			B_MODAL_APP_WINDOW_FEEL,
 			B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
-				| B_AUTO_UPDATE_SIZE_LIMITS)
+				| B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
 {
 	fSetupMsg = msg;
 	fExitSem = create_sem(0, "JobSetup");
diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
index 946234643e..d8f0e34f22 100644
--- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
@@ -98,7 +98,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
 	: HWindow(BRect(0, 0, 200, 100), "Page setup", B_TITLED_WINDOW_LOOK,
  		B_MODAL_APP_WINDOW_FEEL,
  		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
-			| B_AUTO_UPDATE_SIZE_LIMITS),
+			| B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
 	 fResult(B_ERROR),
 	 fSetupMsg(msg),
 	 fAdvancedSettings(*msg),
diff --git a/src/add-ons/print/drivers/postscript/SelectPPDDlg.cpp b/src/add-ons/print/drivers/postscript/SelectPPDDlg.cpp
index 2ef21a1ccf..6f699e4414 100644
--- a/src/add-ons/print/drivers/postscript/SelectPPDDlg.cpp
+++ b/src/add-ons/print/drivers/postscript/SelectPPDDlg.cpp
@@ -50,7 +50,8 @@ public:
 SelectPPDDlg::SelectPPDDlg(PSData* data)
 	: DialogWindow(BRect(10, 10, 400, 400),
 		"Select PPD", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-		B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS),
+		B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS
+			| B_CLOSE_ON_ESCAPE),
 		fPSData(data)
 {
 	SetResult(B_ERROR);
diff --git a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
index 0986bd7d98..9ba38eb419 100644
--- a/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
+++ b/src/add-ons/print/drivers/preview/JobSetupWindow.cpp
@@ -30,7 +30,7 @@ JobSetupWindow::JobSetupWindow(BMessage *msg, const char * printerName)
 	: BlockingWindow(BRect(0, 0, 100, 100), "Job Setup",
 		B_TITLED_WINDOW_LOOK,
  		B_MODAL_APP_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_MINIMIZABLE |
- 			B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
+ 			B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
 	fPrinterName(printerName),
 	fSetupMsg(msg)
 {
diff --git a/src/add-ons/print/drivers/preview/PageSetupWindow.cpp b/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
index 0a886b697c..1606f0e143 100644
--- a/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
+++ b/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
@@ -97,7 +97,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
 			B_TITLED_WINDOW_LOOK,
  			B_MODAL_APP_WINDOW_FEEL,
  			B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
-				| B_AUTO_UPDATE_SIZE_LIMITS),
+				| B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE),
 	fSetupMsg(msg),
 	fPrinterDirName(printerName)
 {
diff --git a/src/add-ons/print/transports/hp_jetdirect/SetupWindow.cpp b/src/add-ons/print/transports/hp_jetdirect/SetupWindow.cpp
index 8b07764688..099f37d487 100644
--- a/src/add-ons/print/transports/hp_jetdirect/SetupWindow.cpp
+++ b/src/add-ons/print/transports/hp_jetdirect/SetupWindow.cpp
@@ -161,7 +161,8 @@ SetupView::CheckSetup()
 SetupWindow::SetupWindow(BDirectory* printerDirectory)
 	: BWindow(BRect(100, 100, 100 + DLG_WIDTH, 100 + DLG_HEIGHT),
 		"HP JetDirect Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE)
+		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
+			| B_CLOSE_ON_ESCAPE)
 {
 	fResult = 0;
 
diff --git a/src/add-ons/print/transports/ipp/IppSetupDlg.cpp b/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
index f3f82c4467..ad2cfd545f 100644
--- a/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
+++ b/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
@@ -148,7 +148,8 @@ bool IppSetupView::UpdateViewData()
 IppSetupDlg::IppSetupDlg(BDirectory *dir)
 	: BWindow(BRect(100, 100, 100 + DLG_WIDTH, 100 + DLG_HEIGHT),
 		"IPP Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE)
+		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
+			| B_CLOSE_ON_ESCAPE)
 {
 	result = 0;
 
diff --git a/src/add-ons/print/transports/lpr/LprSetupDlg.cpp b/src/add-ons/print/transports/lpr/LprSetupDlg.cpp
index 71d7476538..5d82f588ae 100644
--- a/src/add-ons/print/transports/lpr/LprSetupDlg.cpp
+++ b/src/add-ons/print/transports/lpr/LprSetupDlg.cpp
@@ -164,7 +164,8 @@ LprSetupDlg::LprSetupDlg(BDirectory *dir)
 	:
 	DialogWindow(BRect(100, 100, 100 + DLG_WIDTH, 100 + DLG_HEIGHT),
 		"LPR Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
-		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE)
+		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
+		| B_CLOSE_ON_ESCAPE)
 {
 	fSetupView = new LprSetupView(Bounds(), dir);
 	AddChild(fSetupView);
diff --git a/src/add-ons/print/transports/print_to_file/FileSelector.cpp b/src/add-ons/print/transports/print_to_file/FileSelector.cpp
index 7f7157311a..e1ec961316 100644
--- a/src/add-ons/print/transports/print_to_file/FileSelector.cpp
+++ b/src/add-ons/print/transports/print_to_file/FileSelector.cpp
@@ -37,7 +37,7 @@
 
 FileSelector::FileSelector(void)
 	: BWindow(BRect(0,0,320,160), "printtofile", B_TITLED_WINDOW,
-	B_NOT_ZOOMABLE, B_CURRENT_WORKSPACE)
+	B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE, B_CURRENT_WORKSPACE)
 {
 	fExitSem = create_sem(0, "FileSelector");
 	fResult = B_ERROR;
diff --git a/src/libs/print/libprint/AboutBox.cpp b/src/libs/print/libprint/AboutBox.cpp
index 94328bcf33..928b8e4d45 100644
--- a/src/libs/print/libprint/AboutBox.cpp
+++ b/src/libs/print/libprint/AboutBox.cpp
@@ -75,7 +75,8 @@ public:
 };
 
 AboutBoxWindow::AboutBoxWindow(BRect frame, const char *driver_name, const char *version, const char *copyright)
-	: BWindow(frame, "", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE )
+	: BWindow(frame, "", B_TITLED_WINDOW,
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_CLOSE_ON_ESCAPE)
 {
 	char title[256];
 	sprintf(title, "About %s Driver", driver_name);
diff --git a/src/libs/print/libprint/JobSetupDlg.cpp b/src/libs/print/libprint/JobSetupDlg.cpp
index 54b4279d74..0677bcc029 100644
--- a/src/libs/print/libprint/JobSetupDlg.cpp
+++ b/src/libs/print/libprint/JobSetupDlg.cpp
@@ -1022,7 +1022,8 @@ JobSetupDlg::JobSetupDlg(JobData* jobData, PrinterData* printerData,
 	DialogWindow(BRect(100, 100, 200, 200), "PrintJob Setup",
 		B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
 		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
-			| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
+			| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS
+			| B_CLOSE_ON_ESCAPE)
 {
 	SetResult(B_ERROR);
 	AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED));
diff --git a/src/libs/print/libprint/PageSetupDlg.cpp b/src/libs/print/libprint/PageSetupDlg.cpp
index 7a13268724..0c640215f0 100644
--- a/src/libs/print/libprint/PageSetupDlg.cpp
+++ b/src/libs/print/libprint/PageSetupDlg.cpp
@@ -350,7 +350,7 @@ PageSetupDlg::PageSetupDlg(JobData *job_data, PrinterData *printer_data, const P
 	: DialogWindow(BRect(100, 100, 160, 160),
 		"Page Setup", B_TITLED_WINDOW_LOOK, B_MODAL_APP_WINDOW_FEEL,
 		B_NOT_RESIZABLE | B_NOT_MINIMIZABLE | B_NOT_ZOOMABLE
-			| B_AUTO_UPDATE_SIZE_LIMITS)
+			| B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE)
 {
 	AddShortcut('W',B_COMMAND_KEY,new BMessage(B_QUIT_REQUESTED));
 
diff --git a/src/servers/print/ConfigWindow.cpp b/src/servers/print/ConfigWindow.cpp
index 394da48ca9..6295442e10 100644
--- a/src/servers/print/ConfigWindow.cpp
+++ b/src/servers/print/ConfigWindow.cpp
@@ -128,7 +128,8 @@ ConfigWindow::ConfigWindow(config_setup_kind kind, Printer* defaultPrinter,
 	BWindow(ConfigWindow::GetWindowFrame(),
 		B_TRANSLATE("Page setup"),
 		B_TITLED_WINDOW,
-		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
+		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS
+		| B_CLOSE_ON_ESCAPE),
 	fKind(kind),
 	fDefaultPrinter(defaultPrinter),
 	fSettings(settings),