diff --git a/ChangeLog b/ChangeLog
index 4e6124a46..11429de66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
   amount of changes that is considered dangerous (thanks to Tomas Babej).
 - Disable hooks in bash completion script.  Hooks were previously able to
   abort processing or output interfering data, breaking completion.
+- Fix "task add due:tomorrow+3days" failing to work without spaces.
 
 ------ current release ---------------------------
 
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 29194c4dc..e11d20ac1 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -465,9 +465,18 @@ bool Lexer::isDate (std::string& token, Lexer::Type& type)
 //   <ISO8106p> | <Duration>
 bool Lexer::isDuration (std::string& token, Lexer::Type& type)
 {
-  std::size_t marker = 0;
-
+  std::size_t marker = _cursor;
   ISO8601p iso;
+
+  std::string extractedToken;
+  Lexer::Type extractedType;
+  if (isOperator(extractedToken, extractedType))
+  {
+    _cursor = marker;
+    return false;
+  }
+
+  marker = 0;
   if (iso.parse (_text.substr (_cursor), marker))
   {
     type = Lexer::Type::duration;