diff --git a/src/controls/templates/FormLayout.qml b/src/controls/templates/FormLayout.qml
index 6f8cb01c..d94b2198 100644
--- a/src/controls/templates/FormLayout.qml
+++ b/src/controls/templates/FormLayout.qml
@@ -1,177 +1,177 @@
 /*
  *   Copyright 2017 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2 or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.6
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.2
 import org.kde.kirigami 2.3 as Kirigami
 
 Control {
     id: root
     implicitWidth: lay.implicitWidth
     implicitHeight: lay.implicitHeight
     Layout.preferredHeight: lay.implicitHeight
     property bool wideMode: width >= lay.wideImplicitWidth
 
     GridLayout {
         id: lay
         property int wideImplicitWidth
         columns: root.wideMode ? 2 : 1
         rowSpacing: Kirigami.Units.smallSpacing
         columnSpacing: Kirigami.Units.smallSpacing
         property var knownItems: []
         anchors {
             left: parent.left
             top: parent.top
             right: parent.right
         }
 
         Timer {
             id: hintCompression
             onTriggered: {
                 if (root.wideMode) {
                     lay.wideImplicitWidth = lay.implicitWidth;
                 }
             }
         }
         onImplicitWidthChanged: hintCompression.restart();
         Component.onCompleted:  wideImplicitWidth = lay.implicitWidth;
     }
 
     Item {
         id: temp
     }
 
     Timer {
         id: relayoutTimer
         interval: 0
         onTriggered: {
             var __items = children;
             //exclude the layout and temp
             for (var i = 2; i < __items.length; ++i) {
                 var item = __items[i];
 
                 //skip items that are already there
                 if (lay.knownItems.indexOf(item) != -1 ||
                     //exclude Repeaters
                     //NOTE: this is an heuristic but there are't better ways
                     (item.model !== undefined && item.children.length == 0)) {
                     continue;
                 }
                 lay.knownItems.push(item);
 
                 var itemContainer = itemComponent.createObject(temp, {"item": item})
 
                 //if section, label goes after the separator
                 if (item.Kirigami.FormData.isSection) {
                     //put an extra spacer
                     var placeHolder = placeHolderComponent.createObject(lay, {"item": item});
                     placeHolder.Layout.colSpan = 2;
                     itemContainer.parent = lay;
                 }
 
                 var buddy = buddyComponent.createObject(lay, {"item": item})
 
                 itemContainer.parent = lay;
                 //if section, wee need another placeholder
                 if (item.Kirigami.FormData.isSection) {
                     var placeHolder = placeHolderComponent.createObject(lay, {"item": item});
                     placeHolder.parent = lay;
                 }
             }
         }
     }
 
     onChildrenChanged: relayoutTimer.restart();
 
-    Component.onCompleted: childrenChanged()
+    Component.onCompleted: relayoutTimer.triggered();
     Component {
         id: itemComponent
         Item {
             id: container
             property var item
             enabled: item.enabled
             visible: item.visible
             implicitWidth: item.implicitWidth
             Layout.preferredWidth: item.Layout.preferredWidth
             Layout.preferredHeight: Math.max(item.Layout.preferredHeight, item.implicitHeight)
 
             Layout.alignment: (root.wideMode ? Qt.AlignLeft | Qt.AlignVCenter : Qt.AlignHCenter | Qt.AlignTop)
             Layout.fillWidth: item.Kirigami.FormData.isSection
             Layout.columnSpan: item.Kirigami.FormData.isSection ? lay.columns : 1
             onItemChanged: {
                 if (!item) {
                     container.destroy();
                 }
             }
             onXChanged: item.x = x;
             onYChanged: item.y = y;
             onWidthChanged: item.width = width;
         }
     }
     Component {
         id: placeHolderComponent
         Item {
             property var item
             enabled: item.enabled
             visible: item.visible
             width: Kirigami.Units.smallSpacing
             height: Kirigami.Units.smallSpacing
             onItemChanged: {
                 if (!item) {
                     labelItem.destroy();
                 }
             }
         }
     }
     Component {
         id: buddyComponent
         Kirigami.Heading {
             id: labelItem
 
             property var item
             enabled: item.enabled
             visible: item.visible
             Kirigami.MnemonicData.enabled: item.Kirigami.FormData.buddyFor && item.Kirigami.FormData.buddyFor.activeFocusOnTab
             Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.FormLabel
             Kirigami.MnemonicData.label: item.Kirigami.FormData.label
             text: Kirigami.MnemonicData.richTextLabel
 
             level: item.Kirigami.FormData.isSection ? 3 : 5
 
             Layout.preferredHeight: item.Kirigami.FormData.label.length > 0 ? implicitHeight : Kirigami.Units.smallSpacing
 
             Layout.alignment: root.wideMode
                                 ? (Qt.AlignRight | (item.Kirigami.FormData.buddyFor.height > height * 2 ? Qt.AlignTop : Qt.AlignVCenter))
                                 : (Qt.AlignLeft | Qt.AlignBottom)
             verticalAlignment: root.wideMode ? Text.AlignVCenter : Text.AlignBottom
 
             Layout.topMargin: item.Kirigami.FormData.buddyFor.height > implicitHeight * 2 ? Kirigami.Units.smallSpacing/2 : 0
             onItemChanged: {
                 if (!item) {
                     labelItem.destroy();
                 }
             }
             Shortcut {
                 sequence: labelItem.Kirigami.MnemonicData.sequence
                 onActivated: item.Kirigami.FormData.buddyFor.forceActiveFocus()
             }
         }
     }
 }