diff --git a/harbour/source/debug/dbgtmenu.prg b/harbour/source/debug/dbgtmenu.prg
index ab02da8e84..e6b20739be 100644
--- a/harbour/source/debug/dbgtmenu.prg
+++ b/harbour/source/debug/dbgtmenu.prg
@@ -180,7 +180,7 @@ METHOD ClosePopup( nPopup ) CLASS TDbMenu
 
    if nPopup != 0
       oPopup := ::aItems[ nPopup ]:bAction
-      if oPopup:ClassName() == "TDBMENU"
+      if ValType( oPopup ) == "O"
          RestScreen( oPopup:nTop, oPopup:nLeft, oPopup:nBottom + 1, oPopup:nRight + 2,;
                      oPopup:cBackImage )
          oPopup:cBackImage := nil