diff --git a/apps/code/variable_box_controller.cpp b/apps/code/variable_box_controller.cpp
index bb1d59410..01f5fe9dc 100644
--- a/apps/code/variable_box_controller.cpp
+++ b/apps/code/variable_box_controller.cpp
@@ -343,7 +343,7 @@ const char * VariableBoxController::autocompletionForText(int scriptIndex, const
     const char * currentName = node->name();
     int currentNameLength = node->nameLength();
     if ((currentNameLength < 0 || currentNameLength != textLength) && strncmp(text, currentName, textLength) == 0) {
-      *textToInsertLength = currentNameLength - textLength;
+      *textToInsertLength = (currentNameLength < 0 ? strlen(currentName) : currentNameLength) - textLength;
       return currentName + textLength;
     }
   }