diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index 2a3e569d4c..49efbd40ae 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -12,10 +12,14 @@
         style="@style/SessionEditText"
         android:id="@+id/publicKeyEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="80dp"
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:maxLines="2"
+        android:gravity="center_vertical"
         android:hint="@string/fragment_enter_public_key_edit_text_hint" />
 
     <TextView
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index 139a96f71d..ab41859e87 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -12,10 +12,14 @@
         style="@style/SmallSessionEditText"
         android:id="@+id/publicKeyEditText"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="54dp"
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:maxLines="2"
+        android:gravity="center_vertical"
         android:hint="@string/fragment_enter_public_key_edit_text_hint" />
 
     <TextView