diff --git a/src/ast_handlers.hpp b/src/ast_handlers.hpp
index c046040..04e890a 100644
--- a/src/ast_handlers.hpp
+++ b/src/ast_handlers.hpp
@@ -652,7 +652,7 @@
 
         parserContext.m_suggestions.clear();
         boost::mpl::for_each<CommandTypes, boost::type<boost::mpl::_>>([&parserContext](auto cmd) {
-            parserContext.m_suggestions.insert({commandNamesVisitor()(cmd)});
+            parserContext.m_suggestions.insert({commandNamesVisitor()(cmd), " "});
         });
     }
 };
diff --git a/tests/command_completion.cpp b/tests/command_completion.cpp
index 9ab146e..1d44646 100644
--- a/tests/command_completion.cpp
+++ b/tests/command_completion.cpp
@@ -57,15 +57,14 @@
     SECTION("cd")
     {
         input = "cd";
-        // TODO: depending on how Readline works, this will have to be changed to include a space
-        expectedCompletions = {"cd"};
+        expectedCompletions = {"cd "};
         expectedContextLength = 2;
     }
 
     SECTION("create")
     {
         input = "create";
-        expectedCompletions = {"create"};
+        expectedCompletions = {"create "};
         expectedContextLength = 6;
     }