diff --git a/herbstluftwm/panel.sh b/herbstluftwm/panel.sh
index 63cd13f..3b11693 100755
--- a/herbstluftwm/panel.sh
+++ b/herbstluftwm/panel.sh
@@ -1,35 +1,6 @@
 #!/bin/sh
 
 hc() { "${herbstclient_command[@]:-herbstclient}" "$@" ;}
-
-tags() {
-    output=""
-
-    for tag in $(hc tag_status)
-    do
-        status=${tag:0:1}
-        tag_id=${tag:1:1}
-        case $status in
-            '#')
-                item="<fc=gray50>[</fc><fc=#ffee00>$tag_id</fc><fc=gray50>]</fc>"
-                ;;
-            ':')
-                item="<fc=gray50>[</fc><fc=#ee9a00>$tag_id</fc><fc=gray50>]</fc>"
-                ;;
-            '.')
-                item="<fc=gray20>[$tag_id]</fc>"
-                ;;
-            '*')
-                item="<fc=gray50>[</fc><fc=gray50>$tag_id</fc><fc=gray50>]</fc>"
-                ;;
-        esac
-        action="<action=`echo herbstclient use $tag_id`>$item</action>"
-        output="$output$action"
-    done
-
-    echo $output
-}
-
 panel_height=48
 
 for monitor in $(hc list_monitors | cut -d: -f1)
diff --git a/herbstluftwm/tag_status.sh b/herbstluftwm/tag_status.sh
index 8d44aac..7a43bb5 100755
--- a/herbstluftwm/tag_status.sh
+++ b/herbstluftwm/tag_status.sh
@@ -8,6 +8,7 @@ tags() {
         case $status in
             '#')
                 title=$(herbstclient attr clients.focus.title)
+                [ "$title" = "" ] && title="$tag_id"
                 [ ${#title} -ge 30 ] && title="${title:0:29}…"
                 item="<fc=gray50>[</fc><fc=#ffee00>$title</fc><fc=gray50>]</fc>"
                 ;;