diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 0720afd90..3dd40c940 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -12862,6 +12862,7 @@ SUB ideshowtext
                 'Restore BG color in case a matching bracket was printed with different BG
                 IF l = idecy THEN COLOR , 6
                 IF isKeyword > 0 THEN isKeyword = isKeyword - 1
+                IF isKeyword = 0 AND checkKeyword$ = "REM" THEN comment = -1
                 IF isKeyword = 0 THEN checkKeyword$ = "": metacommand = 0: is_Number = 0: isCustomKeyword = 0
             NEXT m
 
@@ -18806,6 +18807,7 @@ FUNCTION ideupdatehelpbox
         END IF
         'end of custom controls
 
+        updateRoutine:
         '-------- update routine -------------------------------------
         SELECT CASE UpdateStep
             CASE 1