diff --git a/apps/opencs/view/world/scripthighlighter.cpp b/apps/opencs/view/world/scripthighlighter.cpp
index 1e93ac26b..288a3d12a 100644
--- a/apps/opencs/view/world/scripthighlighter.cpp
+++ b/apps/opencs/view/world/scripthighlighter.cpp
@@ -40,6 +40,13 @@ bool CSVWorld::ScriptHighlighter::parseSpecial (int code, const Compiler::TokenL
     return true;
 }
 
+bool CSVWorld::ScriptHighlighter::parseComment (const std::string& comment,
+    const Compiler::TokenLoc& loc, Compiler::Scanner& scanner)
+{
+    highlight (loc, Type_Comment);
+    return true;
+}
+
 void CSVWorld::ScriptHighlighter::parseEOF (Compiler::Scanner& scanner)
 {}
 
@@ -67,7 +74,7 @@ CSVWorld::ScriptHighlighter::ScriptHighlighter (QTextDocument *parent)
 
     {
         QTextCharFormat format;
-        format.setForeground (Qt::green);
+        format.setForeground (Qt::magenta);
         mScheme.insert (std::make_pair (Type_Float, format));
     }
 
@@ -88,6 +95,12 @@ CSVWorld::ScriptHighlighter::ScriptHighlighter (QTextDocument *parent)
         format.setForeground (Qt::darkYellow);
         mScheme.insert (std::make_pair (Type_Special, format));
     }
+
+    {
+        QTextCharFormat format;
+        format.setForeground (Qt::green);
+        mScheme.insert (std::make_pair (Type_Comment, format));
+    }
 }
 
 void CSVWorld::ScriptHighlighter::highlightBlock (const QString& text)
diff --git a/apps/opencs/view/world/scripthighlighter.hpp b/apps/opencs/view/world/scripthighlighter.hpp
index e9918f99b..3ef697809 100644
--- a/apps/opencs/view/world/scripthighlighter.hpp
+++ b/apps/opencs/view/world/scripthighlighter.hpp
@@ -22,7 +22,8 @@ namespace CSVWorld
                 Type_Float,
                 Type_Name,
                 Type_Keyword,
-                Type_Special
+                Type_Special,
+                Type_Comment
             };
 
         private:
@@ -58,7 +59,9 @@ namespace CSVWorld
             ///< Handle a special character token.
             /// \return fetch another token?
 
-            ///< Handle a special character token.
+            virtual bool parseComment (const std::string& comment, const Compiler::TokenLoc& loc,
+                Compiler::Scanner& scanner);
+            ///< Handle comment token.
             /// \return fetch another token?
 
             virtual void parseEOF (Compiler::Scanner& scanner);