diff --git a/ChangeLog b/ChangeLog
index 8dbce1162..ba941c247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -156,6 +156,7 @@
 - TW-1688 task fails to import (thanks to Rainer Müller).
 - TW-1692 '42//' segfaults (thanks to Daniel Shahaf).
 - TW-1695 edit: Concurrent edits (thanks to Daniel Shahaf).
+- TW-1699 Command interpretation displayed incorrectly (thanks to Tomas Babej).
 - TW-1701 Some generated UUIDs deemed invalid (thanks to Wim Schuermann).
 - Prevent potential task duplication during import for non-pending tasks.
 - Show the active context in "context list", if any is active.
diff --git a/src/Context.cpp b/src/Context.cpp
index 6fd7117c6..2636b2bef 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -215,7 +215,7 @@ int Context::initialize (int argc, const char** argv)
       if (combined.length ())
         combined += ' ';
 
-      combined += a.getToken ();
+      combined += a.attribute ("raw");
 
       if (a.hasTag ("DEFAULT"))
         foundDefault = true;