diff --git a/gitk-git/gitk b/gitk-git/gitk
index 26294152dbf540..18df002f90cc7c 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -12832,7 +12832,7 @@ if {$::tcl_platform(platform) eq {windows} && [file exists $gitk_prefix/etc/git.
     }
 }
 # wait for the window to become visible
-tkwait visibility .
+if {![winfo viewable .]} {tkwait visibility .}
 set_window_title
 update
 readrefs