diff --git a/src/preferences/network/InterfaceAddressView.cpp b/src/preferences/network/InterfaceAddressView.cpp
index 5584be11f0..5c79a17a25 100644
--- a/src/preferences/network/InterfaceAddressView.cpp
+++ b/src/preferences/network/InterfaceAddressView.cpp
@@ -74,7 +74,7 @@ InterfaceAddressView::InterfaceAddressView(int family,
 	fModeField->SetToolTip(
 		B_TRANSLATE("The method for obtaining an IP address"));
 
-	float minimumWidth = be_control_look->DefaultItemSpacing() * 16;
+	float minimumWidth = be_control_look->DefaultItemSpacing() * 15;
 
 	fAddressField = new IPAddressControl(fFamily, B_TRANSLATE("IP Address:"),
 		NULL);
@@ -96,8 +96,6 @@ InterfaceAddressView::InterfaceAddressView(int family,
 
 	fApplyButton = new BButton("apply", B_TRANSLATE("Apply"),
 		new BMessage(kMsgApply));
-	fApplyButton->SetExplicitAlignment(
-		BAlignment(B_ALIGN_RIGHT, B_ALIGN_VERTICAL_UNSET));
 
 	fSettings.GetInterface(interface, fOriginalSettings);
 	_UpdateFields();
@@ -109,7 +107,10 @@ InterfaceAddressView::InterfaceAddressView(int family,
 			.AddTextControl(fNetmaskField, 0, 2, B_ALIGN_RIGHT)
 			.AddTextControl(fGatewayField, 0, 3, B_ALIGN_RIGHT)
 		.End()
-		.Add(fApplyButton)
+		.AddGroup(B_HORIZONTAL)
+			.AddGlue()
+			.Add(fApplyButton)
+		.End()
 		.AddGlue();
 }
 
diff --git a/src/preferences/network/NetworkWindow.cpp b/src/preferences/network/NetworkWindow.cpp
index a7964b4f0e..b9b42fec31 100644
--- a/src/preferences/network/NetworkWindow.cpp
+++ b/src/preferences/network/NetworkWindow.cpp
@@ -160,6 +160,11 @@ NetworkWindow::NetworkWindow()
 	_ScanAddOns();
 	_UpdateRevertButton();
 
+	fListView->Select(0);
+	_SelectItem(fListView->ItemAt(0));
+		// Call this manually, so that CenterOnScreen() below already
+		// knows the final window size.
+
 	// Set size of the list view from its contents
 	float width;
 	float height;