diff --git a/src/main/java/com/intellij/plugins/haxe/ide/completion/HaxeCompletionAutoPopupHandler.java b/src/main/java/com/intellij/plugins/haxe/ide/completion/HaxeCompletionAutoPopupHandler.java
new file mode 100644
index 000000000..c7b4da1f2
--- /dev/null
+++ b/src/main/java/com/intellij/plugins/haxe/ide/completion/HaxeCompletionAutoPopupHandler.java
@@ -0,0 +1,54 @@
+package com.intellij.plugins.haxe.ide.completion;
+
+import com.intellij.codeInsight.AutoPopupController;
+import com.intellij.codeInsight.completion.CompletionPhase;
+import com.intellij.codeInsight.completion.impl.CompletionServiceImpl;
+import com.intellij.codeInsight.editorActions.CompletionAutoPopupHandler;
+import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInsight.lookup.impl.LookupImpl;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorModificationUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiFile;
+import lombok.CustomLog;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * More or less a copy of CompletionAutoPopupHandler but with allow "$" logic.
+ */
+@CustomLog
+public class HaxeCompletionAutoPopupHandler extends CompletionAutoPopupHandler {
+  @NotNull
+  @Override
+  public Result checkAutoPopup(char charTyped, @NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
+    LookupImpl lookup = (LookupImpl)LookupManager.getActiveLookup(editor);
+
+    CompletionPhase phase = CompletionServiceImpl.getCompletionPhase();
+
+    if (log.isDebugEnabled()) {
+      log.debug("checkAutoPopup: character=" + charTyped + ";");
+      log.debug("phase=" + phase);
+      log.debug("lookup=" + lookup);
+      log.debug("currentCompletion=" + CompletionServiceImpl.getCompletionService().getCurrentCompletion());
+    }
+
+    if (lookup != null) {
+      if (editor.getSelectionModel().hasSelection()) {
+        lookup.performGuardedChange(() -> EditorModificationUtil.deleteSelectedText(editor));
+      }
+      return Result.STOP;
+    }
+
+    if (Character.isLetterOrDigit(charTyped) || charTyped == '_'|| charTyped == '$') {
+      if (phase instanceof CompletionPhase.EmptyAutoPopup && ((CompletionPhase.EmptyAutoPopup)phase).allowsSkippingNewAutoPopup(editor, charTyped)) {
+        return Result.CONTINUE;
+      }
+
+      AutoPopupController.getInstance(project).scheduleAutoPopup(editor);
+      return Result.STOP;
+    }
+
+    return Result.CONTINUE;
+  }
+
+}
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index dc37c359d..3231d5863 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -257,6 +257,8 @@
 
     <extendWordSelectionHandler implementation="com.intellij.plugins.haxe.editor.actions.wordSelection.HaxeStringSelectioner" />
     <extendWordSelectionHandler implementation="com.intellij.plugins.haxe.editor.actions.wordSelection.HaxeCommentSelectioner" />
+    <!-- Overriding default to allow completion on "$"-->
+    <typedHandler implementation="com.intellij.plugins.haxe.ide.completion.HaxeCompletionAutoPopupHandler" id="TestingAutopopup"/>
 
     <completion.contributor id="ControllingCompletion" language="Haxe" implementationClass="com.intellij.plugins.haxe.ide.completion.HaxeControllingCompletionContributor" order="FIRST"/>
     <completion.contributor language="Haxe" implementationClass="com.intellij.plugins.haxe.ide.completion.HaxeKeywordCompletionContributor" order="after ControllingCompletion"/>