diff --git a/Rakefile b/Rakefile
index 0b3d4be..9c0426a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -146,8 +146,12 @@ def install_prezto
   run %{ mkdir -p $HOME/.zsh.after }
   run %{ mkdir -p $HOME/.zsh.prompts }
 
-  puts "Setting zsh as your default shell"
-  run %{ chsh -s /bin/zsh }
+  if ENV[SHELL].include? 'zsh' then
+    puts "Zsh is already configured as your shell of choice. Restart your session to load the new settings"
+  else
+    puts "Setting zsh as your default shell"
+    run %{ chsh -s /bin/zsh }
+  end
 end
 
 def want_to_install? (section)