diff --git a/src/Gui/ExpressionCompleter.cpp b/src/Gui/ExpressionCompleter.cpp
index ac872251ea..698e2005a6 100644
--- a/src/Gui/ExpressionCompleter.cpp
+++ b/src/Gui/ExpressionCompleter.cpp
@@ -1158,6 +1158,12 @@ void ExpressionTextEdit::slotCompleteText(const QString& completionPrefix)
     Base::FlagToggler<bool> flag(block, false);
     cursor.insertText(completionPrefix);
     completer->updatePrefixEnd(cursor.positionInBlock());
+
+    std::string textToComplete = completionPrefix.toUtf8().constData();
+    if (textToComplete.size()
+        && (*textToComplete.crbegin() == '.' || *textToComplete.crbegin() == '#')) {
+        completer->slotUpdate(cursor.block().text(), cursor.positionInBlock());
+    }
 }
 
 void ExpressionTextEdit::keyPressEvent(QKeyEvent* e)