diff --git a/Include/LogicLib.nsh b/Include/LogicLib.nsh
index cab15b4b..fd021559 100644
--- a/Include/LogicLib.nsh
+++ b/Include/LogicLib.nsh
@@ -664,7 +664,7 @@
         !error "Cannot use Case following a CaseElse"
       !endif
       Goto ${${_Logic}EndSelect}                          ; Go to EndSelect (Ends the previous Case)
-      !define /IfNDef _LogicLib_EndSelectLabelUsed
+      !define /IfNDef _LogicLib_EndSelectLabelUsed_${_Logic}
       ${${_Logic}Else}:                                   ; Place the Else label
       !undef ${_Logic}Else                                ; and remove it
     !else
@@ -753,9 +753,9 @@
       !undef ${_Logic}Else                                ; and remove it
     !endif
     !ifdef ${_Logic}EndSelect                             ; This won't be set if there weren't any cases
-      !ifdef _LogicLib_EndSelectLabelUsed                 ; There is no jump to ${${_Logic}EndSelect}: if there is only one Case
+      !ifdef _LogicLib_EndSelectLabelUsed_${_Logic}                 ; There is no jump to ${${_Logic}EndSelect}: if there is only one Case
         ${${_Logic}EndSelect}:                            ; Place the EndSelect
-        !undef _LogicLib_EndSelectLabelUsed
+        !undef _LogicLib_EndSelectLabelUsed_${_Logic}
       !endif
       !undef ${_Logic}EndSelect                           ; and remove it
     !endif