diff --git a/application/res/layout/channeladd.xml b/application/res/layout/channeladd.xml
index f3fd267..e5c818c 100644
--- a/application/res/layout/channeladd.xml
+++ b/application/res/layout/channeladd.xml
@@ -43,7 +43,8 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:text="#"
-                android:layout_weight="1" />
+                android:layout_weight="1"
+                android:inputType="textNoSuggestions" />
             <Button
                 android:id="@+id/add"
                 android:layout_width="wrap_content"
diff --git a/application/res/layout/commandadd.xml b/application/res/layout/commandadd.xml
index 97078d9..73a68cc 100644
--- a/application/res/layout/commandadd.xml
+++ b/application/res/layout/commandadd.xml
@@ -43,7 +43,8 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:text="/"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            android:inputType="textNoSuggestions" />
         <Button
             android:id="@+id/add"
             android:layout_width="wrap_content"
diff --git a/application/res/layout/serveradd.xml b/application/res/layout/serveradd.xml
index 52f8dd8..48454fd 100644
--- a/application/res/layout/serveradd.xml
+++ b/application/res/layout/serveradd.xml
@@ -53,7 +53,8 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:contentDescription="@string/server_host"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true" />
+            android:singleLine="true"
+            android:inputType="textNoSuggestions" />
         <TextView
             android:text="@string/server_port"
             android:layout_width="fill_parent"
@@ -65,7 +66,9 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:minEms="6"
-            android:text="6667" />
+            android:text="6667"
+            android:numeric="integer"
+            android:maxLength="5" />
         <TextView
             android:text="@string/server_password"
             android:layout_width="fill_parent"