@@ -186,16 +186,18 @@ Item {
186186 objectName: "tabbar"
187187 height: units.gu(6.5)
188188 width: parent.width
189− selectionMode: false
190189 style: DashContentTabBarStyle {}
191190
192− // TODO This together with the __styleInstance onModelChanged below
193− // are a workaround for the first tab sometimes not showing the text.
194− // But Tabs are going away in the future so not sure if makes
195− // sense invetigating what's the problem at this stage
196− model: dashContentList.model.count > 0 ? dashContentList.model : null
191+ model: dashContentList.model
197192
198193 onSelectedIndexChanged: {
194+ if (dashContentList.currentIndex == -1 && tabBar.selectedIndex != -1) {
195+ // TODO This together with the Timer below
196+ // are a workaround for the first tab sometimes not showing the text.
197+ // But Tabs are going away in the future so not sure if makes
198+ // sense invetigating what's the problem at this stage
199+ selectionModeTimer.restart();
200+ }
199201 dashContentList.currentIndex = selectedIndex;
200202 }
201203
@@ -206,12 +208,10 @@ Item {
206208 }
207209 }
208210
209− Connections {
210− target: __styleInstance
211− onModelChanged: {
212− tabBar.selectedIndex = -1;
213− tabBar.selectedIndex = 0;
214− }
211+ Timer {
212+ id: selectionModeTimer
213+ interval: 1
214+ onTriggered: tabBar.selectionMode = false
215215 }
216216 }
217217 }