diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
index 4dba0a1..6ccb9a0 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -133,6 +133,7 @@ class PeerListActivity : AppCompatActivity() {
             this.resources.configuration.locale.country
         }
         var schemaInput = view.findViewById<TextView>(R.id.schemaInput)
+        schemaInput.showSoftInputOnFocus = false
         schemaInput.setOnFocusChangeListener { v, b ->
             if(schemaInput.isFocused) {
                 val height = -1 * v.height +30
diff --git a/app/src/main/res/layout/dropdown_item.xml b/app/src/main/res/layout/dropdown_item.xml
index 52d5a22..aba8008 100644
--- a/app/src/main/res/layout/dropdown_item.xml
+++ b/app/src/main/res/layout/dropdown_item.xml
@@ -6,7 +6,7 @@
         android:paddingRight="15dp"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
-        android:background="@drawable/info_panel_rounded_corner">
+        android:background="@color/dark_10">
     <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -24,6 +24,7 @@
                 android:layout_height="wrap_content"
                 android:hint="Schema"
                 android:ellipsize="middle"
-                android:singleLine="true"/>
+                android:singleLine="true"
+                android:textIsSelectable="false"/>
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/new_peer_dialog.xml b/app/src/main/res/layout/new_peer_dialog.xml
index ecfc690..acd6679 100644
--- a/app/src/main/res/layout/new_peer_dialog.xml
+++ b/app/src/main/res/layout/new_peer_dialog.xml
@@ -22,9 +22,10 @@
                 android:layout_height="wrap_content"
                 android:hint="Schema"
                 android:textColor="@color/white"
-                android:inputType="text"
+                android:inputType="textNoSuggestions"
                 android:textCursorDrawable="@null"
-                android:onClick="onClickSchemaList"/>
+                android:onClick="onClickSchemaList"
+                />
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -45,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:digits="0123456789."
                 android:hint="IP/domain"
-                android:inputType="number"
+                android:inputType="textNoSuggestions"
                 android:textColor="@color/white"
                 android:textCursorDrawable="@null"/>
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml
index 9887457..b894aa8 100644
--- a/app/src/main/res/layout/spinner_item.xml
+++ b/app/src/main/res/layout/spinner_item.xml
@@ -11,4 +11,4 @@
         android:textSize="20dp"
         android:gravity="left"
         android:textColor="@color/white"
-        />
\ No newline at end of file
+        android:textIsSelectable="false"/>
\ No newline at end of file