diff --git a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp
index 0bd91ebba..93599699e 100644
--- a/src/celestia/celestiacore.cpp
+++ b/src/celestia/celestiacore.cpp
@@ -1045,10 +1045,12 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
             if (typedText != "")
             {
                 Selection sel = sim->findObjectFromPath(typedText, true);
+#ifdef AUTO_COMPLETION
                 if (sel.empty() && typedTextCompletion.size() > 0)
                 {
                     sel = sim->findObjectFromPath(typedTextCompletion[0], true);
                 }
+#endif
                 if (!sel.empty())
                 {
                     addToHistory();