diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index 0621117..5b4ab4e 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -686,12 +686,7 @@ gui_completion_find_context (struct t_gui_completion *completion,
             }
             pos_start = i + 1;
         }
-        i = pos;
-        while ((i < size) && (data[i] != ' '))
-        {
-            i++;
-        }
-        pos_end = i - 1;
+        pos_end = pos - 1;
 
         if (completion->context == GUI_COMPLETION_COMMAND)
         {