diff --git a/dotfiles/lib/zsh.sh b/dotfiles/lib/zsh.sh
index 32976b53..2392872e 100644
--- a/dotfiles/lib/zsh.sh
+++ b/dotfiles/lib/zsh.sh
@@ -9,3 +9,16 @@ alias zshenv="source ~/.zshenv"
 unalias run-help 2> /dev/null 1>/dev/null
 autoload run-help
 HELPDIR=/usr/local/share/zsh/helpfiles
+
+
+set_powerline_prompt
+
+function if_emacs_zsh {
+    if [ -z $(echo "$INSIDE_EMACS" | grep comint) ]; then
+        echo;
+    else
+        set_my_prompt
+    fi
+}
+
+environment_variable_exists INSIDE_EMACS && if_emacs_zsh