diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
index d3b6cb36c..091418304 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
@@ -134,6 +134,12 @@ public class CreateKeyInputFragment extends Fragment {
                         )
         );
 
+        // Edit text padding doesn't work via xml (http://code.google.com/p/android/issues/detail?id=77982)
+        // so we set the right padding programmatically.
+        mPassphraseEdit.setPadding(mPassphraseEdit.getPaddingLeft(),
+                mPassphraseEdit.getPaddingTop(),
+                (int) (56 * getResources().getDisplayMetrics().density),
+                mPassphraseEdit.getPaddingBottom());
         mPassphraseEdit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
index 76a58acb1..d59cd7b86 100644
--- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml
@@ -59,27 +59,34 @@
                 android:layout_height="wrap_content"
                 android:text="@string/label_passphrase" />
 
-            <EditText
-                android:id="@+id/create_key_passphrase"
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:imeOptions="actionNext"
-                android:inputType="textPassword"
-                android:hint="@string/label_passphrase"
-                android:ems="10"
-                android:layout_gravity="center_horizontal" />
+                android:layout_marginBottom="8dp">
 
-            <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView
-                android:id="@+id/create_key_passphrase_strength"
-                android:layout_width="match_parent"
-                android:layout_height="8dp"
-                android:layout_marginBottom="8dp"
-                custom:strength="medium"
-                custom:showGuides="false"
-                custom:color_fail="@color/android_red_light"
-                custom:color_weak="@color/android_orange_light"
-                custom:color_strong="@color/android_green_light"/>
+                <EditText
+                    android:id="@+id/create_key_passphrase"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:imeOptions="actionNext"
+                    android:inputType="textPassword"
+                    android:hint="@string/label_passphrase"
+                    android:ems="10"
+                    android:layout_gravity="center_horizontal"  />
+
+                <org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthBarView
+                    android:id="@+id/create_key_passphrase_strength"
+                    android:layout_width="48dp"
+                    android:layout_height="8dp"
+                    android:layout_gravity="end|center_vertical"
+                    custom:strength="medium"
+                    custom:showGuides="false"
+                    custom:color_fail="@color/android_red_light"
+                    custom:color_weak="@color/android_orange_light"
+                    custom:color_strong="@color/android_green_light"/>
+
+            </FrameLayout>
 
             <EditText
                 android:id="@+id/create_key_passphrase_again"