diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index ff04a400c00..6cac5595d70 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -18,7 +18,8 @@
         style="@style/wifi_item" >
     <TextView
             style="@style/wifi_item_label"
-            android:id="@+id/name" />
+            android:id="@+id/name"
+            android:textAlignment="viewStart" />
 
     <TextView
             android:id="@+id/value"
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index cf27dd5ab14..9e0f8d71e41 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -1086,7 +1086,7 @@ public class WifiSettings extends SettingsPreferenceFragment
             float titleHeight = resources.getFraction(R.dimen.setup_title_height, 1, 1);
             float sideMargin = resources.getFraction(R.dimen.setup_border_width, 1, 1);
             int bottom = resources.getDimensionPixelSize(R.dimen.setup_margin_bottom);
-            setPadding(
+            setPaddingRelative(
                     (int) (parentWidth * sideMargin),
                     0,
                     (int) (parentWidth * sideMargin),