--- a/gitk-git/gitk	2021-02-08 23:20:55.000000000 +0000
+++ b/gitk-git/gitk	2021-02-11 12:30:24.000000000 +0000
@@ -12658,7 +12658,7 @@
     wm iconphoto . -default gitlogo gitlogo32
 }
 # wait for the window to become visible
-tkwait visibility .
+if {![winfo viewable .]} {tkwait visibility .}
 set_window_title
 update
 readrefs