diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 1386d8e..8149c20 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -60,7 +60,7 @@ bindswitch --reload --locked lid:off output $laptop enable
 
 # Idle configuration
     # set lock and save to script, so other programs can also use it
-    set $lock 'swaylock -f --image /tmp/lock.png --indicator-idle-visible -F'
+    set $lock 'loginctl lock-session && swaylock -f --image /tmp/lock.png --indicator-idle-visible -F'
     exec_always echo $lock > ~/.local/bin/lock.sh
     exec_always chmod +x ~/.local/bin/lock.sh
 
diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc
index 6aa60b0..c87c93e 100644
--- a/files/zsh/.zshrc
+++ b/files/zsh/.zshrc
@@ -14,7 +14,10 @@ DIR="%{$fg[blue]%}%~"
 GIT="%{$fg[red]%}\$vcs_info_msg_0_"
 HOSTN="%{$fg[yellow]%}%m "
 
-export PROMPT="${HOSTN}${DIR}${GIT} ${ICON}%{$reset_color%} "
+BREAK=''
+[ $(tput cols) -lt 150 ] && BREAK=$'\n'
+
+export PROMPT="${HOSTN}${DIR}${GIT} ${BREAK}${ICON}%{$reset_color%} "
 zstyle ':vcs_info:git:*' formats ' (%b )'
 
 # show info in bar