diff --git a/src/pd.tk b/src/pd.tk
index 60b430826e2d63ea0bc226c38b8b3400ceb0615c..fc467471c51fc8fbf20fab4c495abe76f51baa0b 100644
--- a/src/pd.tk
+++ b/src/pd.tk
@@ -1081,15 +1081,25 @@ proc menu_raisenextwindow {} {
 proc menu_raise_console {} {
 	set pd_window .
 	set top_window [lindex [wm stackorder $pd_window] end]
+	focus .
 	if {$pd_window eq $top_window} {
 		lower $pd_window
-		catch {lower .printout}
+		.controls.switches.console instate {selected} {
+			lower .printout
+		}
+		#catch {lower .printout}
 	} else {
 		wm deiconify $pd_window
 		raise $pd_window
-		catch {wm deiconify .printout}
-		catch {wm manage .prinout}
-		raise .printout
+		.controls.switches.console instate {selected} {
+			wm deiconify .printout
+			wm manage .printout
+			raise .printout
+			#focus .printout
+		}
+		#catch {wm deiconify .printout}
+		#catch {wm manage .prinout}
+		#raise .printout
 	}
 }