diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp
index 59ee606b5f..66d4fc9bd7 100644
--- a/src/apps/mediaconverter/MediaConverterWindow.cpp
+++ b/src/apps/mediaconverter/MediaConverterWindow.cpp
@@ -194,13 +194,18 @@ MediaConverterWindow::MediaConverterWindow(BRect frame)
 
 	BLayoutBuilder::Grid<>(outputGrid)
 		.SetInsets(padding, padding, padding, padding)
-		.AddMenuField(fFormatMenu, 0, 0)
-		.AddMenuField(fAudioMenu, 0, 1)
-		.AddMenuField(fVideoMenu, 0, 2)
+		.Add(fFormatMenu->CreateLabelLayoutItem(), 0, 0)
+		.Add(fFormatMenu->CreateMenuBarLayoutItem(), 1, 0)
+		.Add(fAudioMenu->CreateLabelLayoutItem(), 0, 1)
+		.Add(fAudioMenu->CreateMenuBarLayoutItem(), 1, 1)
+		.Add(fVideoMenu->CreateLabelLayoutItem(), 0, 2)
+		.Add(fVideoMenu->CreateMenuBarLayoutItem(), 1, 2)
 		.Add(fDestButton, 0, 3)
 		.Add(fOutputFolder, 1, 3)
-		.AddTextControl(fStartDurationTC, 0, 4)
-		.AddTextControl(fEndDurationTC, 0, 5)
+		.Add(fStartDurationTC->CreateLabelLayoutItem(), 0, 4)
+		.Add(fStartDurationTC->CreateTextViewLayoutItem(), 1, 4)
+		.Add(fEndDurationTC->CreateLabelLayoutItem(), 0, 5)
+		.Add(fEndDurationTC->CreateTextViewLayoutItem(), 1, 5)
 		.Add(fVideoQualitySlider, 0, 6, 2, 1)
 		.Add(fAudioQualitySlider, 0, 7, 2, 1);