diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17bec36..d7ced19 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustPan"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
diff --git a/app/src/main/res/layout-land/content_main.xml b/app/src/main/res/layout-land/content_main.xml
index 0a2440a..de790fa 100644
--- a/app/src/main/res/layout-land/content_main.xml
+++ b/app/src/main/res/layout-land/content_main.xml
@@ -29,7 +29,10 @@
                 android:layout_weight="1"
                 android:autofillHints=""
                 android:gravity="center"
+                android:imeOptions="actionDone"
                 android:inputType="text"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
                 android:text="@string/team_a"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
@@ -40,7 +43,10 @@
                 android:layout_weight="1"
                 android:autofillHints=""
                 android:gravity="center"
+                android:imeOptions="actionDone"
                 android:inputType="text"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
                 android:text="@string/team_b"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 844ea9c..c014338 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -20,18 +20,24 @@
             android:layout_weight="1"
             android:autofillHints=""
             android:gravity="center"
+            android:imeOptions="actionDone"
             android:inputType="text"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
             android:text="@string/team_a"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
         <EditText
             android:id="@+id/NameTeamB"
+            android:imeOptions="actionDone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:autofillHints=""
             android:gravity="center"
             android:inputType="text"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
             android:text="@string/team_b"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1" />