diff --git a/src/widgets/track-info-panel.vala b/src/widgets/track-info-panel.vala
index a7d234ae..68eded97 100644
--- a/src/widgets/track-info-panel.vala
+++ b/src/widgets/track-info-panel.vala
@@ -80,6 +80,8 @@ public class Cassette.TrackInfoPanel : Adw.Bin, Gtk.Orientable {
 
                 play_mark_track.init_content (value.id);
             }
+
+            update_labels_visibility ();
         }
     }
 
@@ -211,19 +213,16 @@ public class Cassette.TrackInfoPanel : Adw.Bin, Gtk.Orientable {
     }
 
     construct {
-        track_version_label.notify["label"].connect (() => {
-            track_version_label.visible = track_version_label.label != "";
-        });
-
-        track_authors_label.notify["label"].connect (() => {
-            track_authors_label.visible = track_authors_label.label != "";
-        });
-
         notify["position"].connect (() => {
             position_label.label = position.to_string ();
         });
     }
 
+    void update_labels_visibility () {
+        track_version_label.visible = track_version_label.label != "";
+        track_authors_label.visible = track_authors_label.label != "";
+    }
+
     public PlayMarkTrack get_play_mark_track () {
         return play_mark_track;
     }