diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java b/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java
index 78146f3d..638e04ba 100644
--- a/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/cell/hint/CellHintPopupListener.java
@@ -248,6 +248,7 @@ public class CellHintPopupListener<T extends JComponent, I> extends MouseInputAd
     }
 
     private void movePopup(final Rectangle bounds) {
+        if (popup == null) return;
         DarkPopupFactory.PopupType popupType = DarkPopupFactory.getPopupType(popup);
         Window w = DarkUIUtil.getWindow(popupComponent);
         if (popupType == DarkPopupFactory.PopupType.HEAVY_WEIGHT) {