diff --git a/modules/env-js-mode.el b/modules/env-js-mode.el
index 95acc6074..b8a39945f 100644
--- a/modules/env-js-mode.el
+++ b/modules/env-js-mode.el
@@ -1,6 +1,11 @@
 
 (require-packages '(tern tern-auto-complete))
 
+(setq tern-ac-on-dot nil)
+
+;; replace auto-complete with tern-ac-complete only in js-mode
+(add-hook 'change-major-mode-hook
+		  (lambda () (evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'auto-complete)))
 (add-hook 'js-mode-hook
 		  (lambda ()
 			(evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'tern-ac-complete)