diff --git a/lib/blame.tcl b/lib/blame.tcl
index 691941e95948e7d332d6984aa6e2cc0956147550..49eae1912a4040fff2a7799aa9fb73482cad3f1e 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -1201,6 +1201,7 @@ method _open_tooltip {cur_w} {
 		_hide_tooltip $this
 
 		set tooltip_wm [toplevel $cur_w.tooltip -borderwidth 1]
+		catch {wm attributes $tooltip_wm -type tooltip}
 		wm overrideredirect $tooltip_wm 1
 		wm transient $tooltip_wm [winfo toplevel $cur_w]
 		set tooltip_t $tooltip_wm.label
diff --git a/lib/choose_rev.tcl b/lib/choose_rev.tcl
index 54c7957a66aa5784d47708edc05a1c95178ed7a2..6dae7937d589c174132e9f8b9bd77133e189590f 100644
--- a/lib/choose_rev.tcl
+++ b/lib/choose_rev.tcl
@@ -497,6 +497,7 @@ method _open_tooltip {} {
 
 	if {$tooltip_wm eq {}} {
 		set tooltip_wm [toplevel $w_list.tooltip -borderwidth 1]
+		catch {wm attributes $tooltip_wm -type tooltip}
 		wm overrideredirect $tooltip_wm 1
 		wm transient $tooltip_wm [winfo toplevel $w_list]
 		set tooltip_t $tooltip_wm.label
diff --git a/lib/class.tcl b/lib/class.tcl
index c27b71476ac35dbad02b727f28aba5d7c0777e75..f08506f3834a1ec821390190b920146d83078997 100644
--- a/lib/class.tcl
+++ b/lib/class.tcl
@@ -138,6 +138,7 @@ proc make_dialog {t w args} {
 	upvar $t top $w pfx this this
 	global use_ttk
 	uplevel [linsert $args 0 make_toplevel $t $w]
+	catch {wm attributes $top -type dialog}
 	pave_toplevel $pfx
 }
 
diff --git a/lib/themed.tcl b/lib/themed.tcl
index 29a1696d9707ec588680053248b135bca7606220..8b88d3678b7ddd802260f47bcfeff8a895d93f3f 100644
--- a/lib/themed.tcl
+++ b/lib/themed.tcl
@@ -123,6 +123,7 @@ proc paddedlabel {w args} {
 # place a themed frame over the surface.
 proc Dialog {w args} {
 	eval [linsert $args 0 toplevel $w -class Dialog]
+	catch {wm attributes $w -type dialog}	
 	pave_toplevel $w
 	return $w
 }
diff --git a/lib/transport.tcl b/lib/transport.tcl
index 7fad9b7d91a6d6a0671ca7bac714dcc4fd022403..e5d211edea05cbfb856e81a9d683a5fb0f4f4b20 100644
--- a/lib/transport.tcl
+++ b/lib/transport.tcl
@@ -124,6 +124,7 @@ proc do_push_anywhere {} {
 
 	set w .push_setup
 	toplevel $w
+	catch {wm attributes $w -type dialog}
 	wm withdraw $w
 	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 	pave_toplevel $w