diff --git a/src/apps/diskprobe/OpenWindow.cpp b/src/apps/diskprobe/OpenWindow.cpp
index 108780628e..8b56c525b1 100644
--- a/src/apps/diskprobe/OpenWindow.cpp
+++ b/src/apps/diskprobe/OpenWindow.cpp
@@ -13,7 +13,7 @@
 #include <Directory.h>
 #include <Entry.h>
 #include <GroupLayout.h>
-#include <GridLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <MenuField.h>
 #include <MenuItem.h>
@@ -58,12 +58,18 @@ OpenWindow::OpenWindow()
 
 	SetLayout(new BGroupLayout(B_HORIZONTAL));
 
-	AddChild(BGridLayoutBuilder(8, 8)
-		.Add(field, 0, 0, 3)
-		.Add(cancelButton, 0, 1)
-		.Add(probeFileButton, 1, 1)
-		.Add(probeDeviceButton, 2, 1)
-		.SetInsets(8, 8, 8, 8)
+	AddChild(BLayoutBuilder::Group<>()
+		.AddGroup(B_VERTICAL)
+			.Add(field)
+			.AddGroup(B_HORIZONTAL)
+				.Add(cancelButton)
+				.Add(probeFileButton)
+				.AddGlue()
+				.Add(probeDeviceButton)
+				.End()
+			.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
+				B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
+			.End()
 	);
 
 	CenterOnScreen();