diff --git a/src/preferences/network/InterfaceAddressView.cpp b/src/preferences/network/InterfaceAddressView.cpp
index 7d6af98e6c..387dcb30e6 100644
--- a/src/preferences/network/InterfaceAddressView.cpp
+++ b/src/preferences/network/InterfaceAddressView.cpp
@@ -260,7 +260,8 @@ InterfaceAddressView::_SetModeField(uint32 mode)
 		fAddressField->SetText(NULL);
 		fNetmaskField->SetText(NULL);
 		fGatewayField->SetText(NULL);
-	}
+	} else if (mode == kModeStatic)
+		fAddressField->MakeFocus(true);
 
 	fLastMode = mode;
 }