diff --git a/elixir-mode.el b/elixir-mode.el
index 2439e6c1..82b57fcb 100644
--- a/elixir-mode.el
+++ b/elixir-mode.el
@@ -343,7 +343,7 @@
 (defconst elixir-mode-font-lock-defaults
   (list
    ;; comments:
-   '("#.*$" . font-lock-comment-face)
+   '("\\(^\\|[^?]\\)#.*$" . font-lock-comment-face)
 
    ;; records and modules at point of definition:
    '("^\\s *def\\(module\\|record\\|protocol\\|impl\\)\\s +\\([^( \t\n,]+\\)" 2 font-lock-type-face)
diff --git a/elixir-smie.el b/elixir-smie.el
index be4fe84a..4a22d1f2 100644
--- a/elixir-smie.el
+++ b/elixir-smie.el
@@ -14,7 +14,6 @@
   (let ((elixir-mode-syntax-table (make-syntax-table)))
     (modify-syntax-entry ?_ "w" elixir-mode-syntax-table)
     (modify-syntax-entry ?' "\"" elixir-mode-syntax-table)
-    (modify-syntax-entry ?# "<" elixir-mode-syntax-table)
     (modify-syntax-entry ?\n ">" elixir-mode-syntax-table)
     (modify-syntax-entry ?\( "()" elixir-mode-syntax-table)
     (modify-syntax-entry ?\) ")(" elixir-mode-syntax-table)