diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp
index a48961408..4eb56313d 100644
--- a/src/guiengine/widgets/label_widget.cpp
+++ b/src/guiengine/widgets/label_widget.cpp
@@ -110,6 +110,9 @@ void LabelWidget::add()
 
     if (m_scroll_speed <= 0)
         m_element->setNotClipped(true);
+
+    if (!m_is_visible)
+        m_element->setVisible(false);
 }   // add
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/tracks_screen.cpp b/src/states_screens/tracks_screen.cpp
index 70b91f20a..4fd4922b0 100644
--- a/src/states_screens/tracks_screen.cpp
+++ b/src/states_screens/tracks_screen.cpp
@@ -183,10 +183,8 @@ void TracksScreen::beforeAddingWidget()
         m_laps = NULL;
         m_reversed = NULL;
         getWidget("lap-text")->setVisible(false);
-        getWidget<LabelWidget>("lap-text")->setText(L"", false);
         getWidget("lap-spinner")->setVisible(false);
         getWidget("reverse-text")->setVisible(false);
-        getWidget<LabelWidget>("reverse-text")->setText(L"", false);
         getWidget("reverse")->setVisible(false);
         calculateLayout();
     }