diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
index 3d76203ca6fb8d5e0c0a6265e6850e1fc9c5eb1d..6c1f731f4b79045a0acec8c02f6cab6e9b18f4d9 100644
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -200,11 +200,12 @@ QGCView {
                                     exclusiveGroup: setupButtonGroup
                                     onClicked: {
                                         checked = true
-                                        factRowsLoader.sourceComponent  = null
+                                        // Clear the rows from the component first. This allows us to change the componentId without
+                                        // breaking any bindings.
+                                        factRowsLoader.parameterNames   = [ ]
                                         _rowWidth                       = 10
                                         factRowsLoader.componentId      = componentId
                                         factRowsLoader.parameterNames   = controller.getParametersForGroup(componentId, modelData)
-                                        factRowsLoader.sourceComponent  = factRowsComponent
                                         _currentGroup                   = modelData
                                     }
                                 }