diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 07546fd34..a7be1efc9 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -225,4 +225,9 @@ build_prompt() {
   prompt_end
 }
 
-PROMPT='%{%f%b%k%}$(build_prompt) '
+if [ "${PROMPT_ON_NEWLINE}" = "true" ] ; then
+  PROMPT='╭─%{%f%b%k%}$(build_prompt)
+╰─ '
+else
+  PROMPT='%{%f%b%k%}$(build_prompt) '
+fi