diff --git a/client/Android/Studio/aFreeRDP/build.gradle b/client/Android/Studio/aFreeRDP/build.gradle
index d0ffb0344..62347deab 100644
--- a/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@ -22,7 +22,7 @@ android {
             storeType "jks"
         }
     }
-    
+
     buildTypes {
         release {
             minifyEnabled false
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/advanced_settings.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/advanced_settings.xml
index a2cac2a7c..4ed368576 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/advanced_settings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/advanced_settings.xml
@@ -65,10 +65,12 @@
             android:title="@string/settings_security" />
         <EditTextPreference
             android:key="bookmark.remote_program"
+            android:singleLine="true"
             android:summary="notepad.exe"
             android:title="@string/settings_remote_program" />
         <EditTextPreference
             android:key="bookmark.work_dir"
+            android:singleLine="true"
             android:title="@string/settings_work_dir" />
         <CheckBoxPreference
             android:key="bookmark.console_mode"
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/bookmark_settings.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/bookmark_settings.xml
index 2b3efa927..bc184c6b9 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/bookmark_settings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/bookmark_settings.xml
@@ -16,10 +16,12 @@
         android:title="@string/settings_cat_host">
         <EditTextPreference
             android:key="bookmark.label"
+            android:singleLine="true"
             android:summary="@string/settings_label"
             android:title="@string/settings_label" />
         <EditTextPreference
             android:key="bookmark.hostname"
+            android:singleLine="true"
             android:summary="Name or address of the target computer"
             android:title="@string/settings_hostname" />
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/credentials_settings.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/credentials_settings.xml
index c7d10218d..708907fba 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/credentials_settings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/credentials_settings.xml
@@ -12,13 +12,16 @@
     <PreferenceCategory android:title="Credentials">
         <EditTextPreference
             android:key="bookmark.username"
+            android:singleLine="true"
             android:title="@string/settings_username" />
         <EditTextPreference
             android:inputType="textPassword"
+            android:singleLine="true"
             android:key="bookmark.password"
             android:title="@string/settings_password" />
         <EditTextPreference
             android:key="bookmark.domain"
+            android:singleLine="true"
             android:summary="Optional"
             android:title="@string/settings_domain" />
     </PreferenceCategory>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/gateway_settings.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/gateway_settings.xml
index e59535990..a856119de 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/gateway_settings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/gateway_settings.xml
@@ -13,6 +13,7 @@
     <PreferenceCategory android:title="@string/settings_cat_gateway">
         <EditTextPreference
             android:key="bookmark.gateway_hostname"
+            android:singleLine="true"
             android:summary="Name or address of the target computer"
             android:title="@string/settings_hostname" />
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
@@ -26,13 +27,16 @@
             freerdp:bounds_min="10" />
         <EditTextPreference
             android:key="bookmark.gateway_username"
+            android:singleLine="true"
             android:title="@string/settings_username" />
         <EditTextPreference
             android:inputType="textPassword"
+            android:singleLine="true"
             android:key="bookmark.gateway_password"
             android:title="@string/settings_password" />
         <EditTextPreference
             android:key="bookmark.gateway_domain"
+            android:singleLine="true"
             android:summary="Optional"
             android:title="@string/settings_domain" />
     </PreferenceCategory>
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings.xml
index 8f6125237..d5016f7be 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings.xml
@@ -26,12 +26,14 @@
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
             android:key="bookmark.width"
             android:title="@string/settings_width"
+            android:singleLine="true"
             freerdp:bounds_default="640"
             freerdp:bounds_max="2048"
             freerdp:bounds_min="640" />
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
             android:key="bookmark.height"
             android:title="@string/settings_height"
+            android:singleLine="true"
             freerdp:bounds_default="480"
             freerdp:bounds_max="2048"
             freerdp:bounds_min="480" />
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings_3g.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings_3g.xml
index 6645c70ea..c9db098fc 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings_3g.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/screen_settings_3g.xml
@@ -25,12 +25,14 @@
             android:title="@string/settings_resolution" />
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
             android:key="bookmark.width_3g"
+            android:singleLine="true"
             android:title="@string/settings_width"
             freerdp:bounds_default="640"
             freerdp:bounds_max="2048"
             freerdp:bounds_min="640" />
         <com.freerdp.freerdpcore.utils.IntEditTextPreference
             android:key="bookmark.height_3g"
+            android:singleLine="true"
             android:title="@string/settings_height"
             freerdp:bounds_default="480"
             freerdp:bounds_max="2048"
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_client.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_client.xml
index e14077f91..c663f4302 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_client.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_client.xml
@@ -2,5 +2,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <EditTextPreference
         android:key="@string/preference_key_client_name"
+        android:singleLine="true"
         android:title="@string/preference_title_client_name" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_power.xml b/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_power.xml
index 5ab201555..04b7fbeb5 100644
--- a/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_power.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/res/xml/settings_app_power.xml
@@ -3,6 +3,7 @@
     xmlns:freerdp="http://schemas.android.com/apk/res-auto">
     <com.freerdp.freerdpcore.utils.IntEditTextPreference
         android:inputType="number"
+        android:singleLine="true"
         android:key="@string/preference_key_power_disconnect_timeout"
         android:numeric="integer"
         android:title="@string/settings_power_disconnect_timeout"