diff --git a/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml b/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
index d9142d234..a423885ea 100644
--- a/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
+++ b/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
@@ -112,7 +112,7 @@ Item {
             if (childCount != 0) {
                 //not too much efficient but the loop over children needs to be done two times to get the proper child width
                 for (var i = 0; i < childCount; ++i) {
-                    if (!root.children[i].visible || root.children[i].text == undefined) {
+                    if (!root.children[i].visible || root.children[i].text === undefined) {
                         --visibleChildCount
                     }
                 }
@@ -123,7 +123,7 @@ Item {
 
                 for (var i = 0; i < childCount; ++i, itemIndex += increment) {
                     var child = root.children[itemIndex]
-                    if (!child.visible) {
+                    if (!child.visible || root.children[i].text === undefined) {
                         continue
                     }