diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/ui/MapUnitTooltipManager.java b/game-app/game-core/src/main/java/games/strategy/triplea/ui/MapUnitTooltipManager.java
index 23db987c0b8..f452618b8fe 100644
--- a/game-app/game-core/src/main/java/games/strategy/triplea/ui/MapUnitTooltipManager.java
+++ b/game-app/game-core/src/main/java/games/strategy/triplea/ui/MapUnitTooltipManager.java
@@ -153,7 +153,7 @@ public void updateTooltip(final String tipText) {
 
   @Override
   public void actionPerformed(final ActionEvent e) {
-    if (text != null && text.length() > 0) {
+    if (text != null && text.length() > 0 && window != null && window.isActive()) {
       final Point currentPoint = MouseInfo.getPointerInfo().getLocation();
       if (isPointWithinParentBounds(currentPoint)) {
         final PopupFactory popupFactory = PopupFactory.getSharedInstance();