diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 16d24a63a..69b953fb4 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -708,6 +708,15 @@ DO
             END IF
         NEXT
 
+        'attempt to cleanse sfname$, just in case there are any comments or other unwanted stuff
+        for CleanseSFNAME = 1 to len(sfname$)
+            select case mid$(sfname$, CleanseSFNAME, 1)
+                case " ", "'", ":"
+                    sfname$ = left$(sfname$, CleanseSFNAME - 1)
+                    exit for
+            end select
+        next
+
         'update title of main window
         COLOR 7, 1: LOCATE 2, 2: PRINT STRING$(idewx - 2, "Ä");
         IF LEN(ideprogname) THEN a$ = ideprogname ELSE a$ = "Untitled" + tempfolderindexstr$
@@ -6477,6 +6486,15 @@ FOR y = 1 TO iden
         'instead of the currently in edition, for a quick link functionality:
         IF a2$ = UCASE$(n$) THEN PreferCurrentCursorSUBFUNC = (LEN(ly$) / 4)
 
+        'attempt to cleanse n$, just in case there are any comments or other unwanted stuff
+        for CleanseN = 1 to len(n$)
+            select case mid$(n$, CleanseN, 1)
+                case " ", "'", ":"
+                    n$ = left$(n$, CleanseN - 1)
+                    exit for
+            end select
+        next
+
         IF LEN(n$) <= 20 THEN
             n$ = n$ + SPACE$(20 - LEN(n$))
         ELSE