diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
index 12396c0be474..c6faed8be5b6 100644
--- a/src/app/qgsmergeattributesdialog.cpp
+++ b/src/app/qgsmergeattributesdialog.cpp
@@ -267,6 +267,11 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
         currentComboBox->setCurrentIndex( currentComboBox->findData( QStringLiteral( "manual" ) ) );
         currentComboBox->blockSignals( false );
       }
+
+      const QgsEditorWidgetSetup setup = mFields.at( idx ).editorWidgetSetup();
+
+      if ( !setup.isNull() && !setup.type().isEmpty() )
+        updateManualWidget( j, true );
     }
   }