diff --git a/src/main.sh b/src/main.sh
index 502848f..ef383ea 100755
--- a/src/main.sh
+++ b/src/main.sh
@@ -193,6 +193,11 @@ case "${1:-}" in
   printf "+change-border-label(%s)+change-list-label(%s)" "$view" "$mbid"
   # Set header
   fzf_command_set_header "$view" "$mbid"
+  # Set preview window
+  case "$view" in
+  "$VIEW_LIST_ARTISTS" | "$VIEW_SEARCH_ARTIST") printf "+show-preview" ;;
+  *) printf "+hide-preview" ;;
+  esac
   # Load lines
   printf "+reload($0 --lines %s %s)" "$view" "$mbid"
   [ "$mode" = "$MODE_NORMAL" ] && printf "+hide-input"
@@ -239,7 +244,7 @@ case "${1:-}" in
   info "Done"
   exit 0
   ;;
-"--internal-preview-artist")
+"--preview-artist")
   __preview_artist "$2"
   exit 0
   ;;
@@ -483,6 +488,8 @@ open \"\$(dirname {4})\"" \
         --bind="$KEYS_PLAY:" \
         --bind="$KEYS_QUEUE:" \
         --bind="$KEYS_SHOW_PLAYLIST:" \
+        --preview-window="right,25%,border-left,wrap,<30(hidden)" \
+        --preview="$0 --preview-artist {3}" \
         --delimiter="\t" \
         --with-nth="{1}" || true
     )
@@ -496,5 +503,3 @@ done
 #        --bind="load:transform:$0 --fzf-load" \
 #        --bind="change:execute-silent($0 --fzf-change &)+reload:$0 --fzf-change-reload" \
 #        --bind="$KEYS_ALL:transform:$0 --fzf-key {2} {3} {4}" \
-#        --preview-window="right,25%,border-left,wrap,<30(hidden)" \
-#        --preview="$0 --internal-preview-artist {3}" \