diff --git a/data/gui/window/chat_log.cfg b/data/gui/window/chat_log.cfg
index 92161151584..71c2f32fe28 100644
--- a/data/gui/window/chat_log.cfg
+++ b/data/gui/window/chat_log.cfg
@@ -185,10 +185,7 @@
                                     id = "copy"
                                     definition = "action_copy"
                                     label = _ "clipboard^Copy"
-                                    # FIXME: tooltips cause weird interactions with map
-                                    #        labels while running a GUI2 dialog, so let's
-                                    #        not use a tooltip yet.
-                                    #tooltip = _ "Copy this log to clipboard"
+                                    tooltip = _ "Copy this log to clipboard"
                                 [/button]
                             [/column]
 
diff --git a/data/gui/window/gamestate_inspector.cfg b/data/gui/window/gamestate_inspector.cfg
index be3df4f07df..bc664a7d912 100644
--- a/data/gui/window/gamestate_inspector.cfg
+++ b/data/gui/window/gamestate_inspector.cfg
@@ -333,10 +333,7 @@
 									id = "copy"
 									definition = "action_copy"
 									label = _ "clipboard^Copy"
-									# FIXME: tooltips cause weird interactions with map
-									#        labels while running a GUI2 dialog, so let's
-									#        not use a tooltip yet.
-									#tooltip = _ "Copy this report to clipboard"
+									tooltip = _ "Copy this report to clipboard"
 								[/button]
 							[/column]
 
diff --git a/data/gui/window/lua_interpreter.cfg b/data/gui/window/lua_interpreter.cfg
index 5d676b27f77..79532015a95 100644
--- a/data/gui/window/lua_interpreter.cfg
+++ b/data/gui/window/lua_interpreter.cfg
@@ -103,10 +103,7 @@
 									id = "copy"
 									definition = "action_copy"
 									label = _ "clipboard^Copy"
-									# FIXME: tooltips cause weird interactions with map
-									#        labels while running a GUI2 dialog, so let's
-									#        not use a tooltip yet.
-									#tooltip = _ "Copy this log to clipboard"
+									tooltip = _ "Copy this log to clipboard"
 								[/button]
 							[/column]
 
@@ -118,10 +115,7 @@
 								[button]
 									id = "clear"
 									label = _ "Clear Console"
-									# FIXME: tooltips cause weird interactions with map
-									#        labels while running a GUI2 dialog, so let's
-									#        not use a tooltip yet.
-									#tooltip = _ "Clear the log area"
+									tooltip = _ "Clear the log area"
 								[/button]
 							[/column]