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 8c1875c..67d0e86 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -133,13 +133,17 @@ class PeerListActivity : AppCompatActivity() {
             this.resources.configuration.locale.country
         }
         var schemaInput = view.findViewById<TextView>(R.id.schemaInput)
+        var ipInput = view.findViewById<TextView>(R.id.ipInput)
+        ipInput.requestFocus()
         schemaInput.showSoftInputOnFocus = false
         schemaInput.setOnFocusChangeListener { v, b ->
             if(schemaInput.isFocused) {
-                val height = -1 * v.height +30
-                getAddressListPopup()?.showAsDropDown(v, -10, height)
+                onClickSchemaList(v)
             }
         }
+        schemaInput.setOnClickListener { v->
+            onClickSchemaList(v)
+        }
         getPopupWindow(R.layout.spinner_item, resources.getStringArray(R.array.schemas), schemaInput, getString(R.string.schema));
         var ccp = view.findViewById<com.hbb20.CountryCodePicker>(R.id.ccp)
         ccp.setCountryForNameCode(countryCode)
@@ -148,7 +152,6 @@ class PeerListActivity : AppCompatActivity() {
         var ad = ab.show()
         var addButton = view.findViewById<Button>(R.id.add)
         addButton.setOnClickListener{
-            var ipInput = view.findViewById<TextView>(R.id.ipInput)
             var portInput = view.findViewById<TextView>(R.id.portInput)
             var ccpInput = view.findViewById<com.hbb20.CountryCodePicker>(R.id.ccp)
             var schema = schemaInput.text.toString().toLowerCase()
@@ -175,7 +178,7 @@ class PeerListActivity : AppCompatActivity() {
 
     fun onClickSchemaList(v: View) {
         val height = -1 * v.height +30
-        getAddressListPopup()?.showAsDropDown(v, -10, height)
+        getAddressListPopup()?.showAsDropDown(v, -5, height)
     }
 
     private fun getAddressListPopup(): PopupWindow? {
@@ -203,7 +206,7 @@ class PeerListActivity : AppCompatActivity() {
         //popupWindow.setWidth(400);
         val display: Display =
             (this.getSystemService(Context.WINDOW_SERVICE) as WindowManager).getDefaultDisplay()
-        popupWindow.width = display.getWidth() - 230
+        popupWindow.width = 320
         popupWindow.height = WindowManager.LayoutParams.WRAP_CONTENT
         // set the list view as pop up window content
         popupWindow.contentView = listView
diff --git a/app/src/main/res/layout/new_peer_dialog.xml b/app/src/main/res/layout/new_peer_dialog.xml
index f9a8df4..7a77a8c 100644
--- a/app/src/main/res/layout/new_peer_dialog.xml
+++ b/app/src/main/res/layout/new_peer_dialog.xml
@@ -23,9 +23,7 @@
                 android:hint="Schema"
                 android:textColor="@color/white"
                 android:inputType="textNoSuggestions"
-                android:textCursorDrawable="@null"
-                android:onClick="onClickSchemaList"
-                />
+                android:textCursorDrawable="@null"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout
@@ -49,7 +47,7 @@
                 android:inputType="textNoSuggestions"
                 android:textColor="@color/white"
                 android:textCursorDrawable="@null"
-                />
+                android:focusedByDefault="true"/>
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.textfield.TextInputLayout