diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml
index 1d387d54..69fd27f0 100644
--- a/app/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/app/src/main/res/layout/tunnel_editor_fragment.xml
@@ -70,7 +70,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/interface_name_label"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="textNoSuggestions|textVisiblePassword"
                         android:text="@={name}"
                         app:filter="@{NameInputFilter.newInstance()}" />
 
@@ -90,7 +90,7 @@
                         android:layout_below="@+id/private_key_label"
                         android:layout_toStartOf="@+id/generate_private_key_button"
                         android:contentDescription="@string/public_key_description"
-                        android:inputType="textVisiblePassword"
+                        android:inputType="textNoSuggestions|textVisiblePassword"
                         android:text="@={config.interface.privateKey}"
                         app:filter="@{KeyInputFilter.newInstance()}" />
 
@@ -142,7 +142,7 @@
                         android:layout_alignParentStart="true"
                         android:layout_below="@+id/addresses_label"
                         android:layout_toStartOf="@+id/listen_port_text"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="textNoSuggestions|textVisiblePassword"
                         android:text="@={config.interface.address}" />
 
                     <TextView
@@ -184,7 +184,7 @@
                         android:layout_alignParentStart="true"
                         android:layout_below="@+id/dns_servers_label"
                         android:layout_toStartOf="@+id/mtu_text"
-                        android:inputType="textNoSuggestions"
+                        android:inputType="textNoSuggestions|textVisiblePassword"
                         android:text="@={config.interface.dns}" />
 
                     <TextView
diff --git a/app/src/main/res/layout/tunnel_editor_peer.xml b/app/src/main/res/layout/tunnel_editor_peer.xml
index a3a2a9c8..ea731349 100644
--- a/app/src/main/res/layout/tunnel_editor_peer.xml
+++ b/app/src/main/res/layout/tunnel_editor_peer.xml
@@ -61,7 +61,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/public_key_label"
-            android:inputType="textVisiblePassword"
+            android:inputType="textNoSuggestions|textVisiblePassword"
             android:text="@={item.publicKey}"
             app:filter="@{KeyInputFilter.newInstance()}" />
 
@@ -79,7 +79,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/pre_shared_key_label"
             android:hint="@string/hint_optional"
-            android:inputType="textNoSuggestions"
+            android:inputType="textNoSuggestions|textVisiblePassword"
             android:text="@={item.preSharedKey}" />
 
         <TextView
@@ -95,7 +95,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/allowed_ips_label"
-            android:inputType="textNoSuggestions"
+            android:inputType="textNoSuggestions|textVisiblePassword"
             android:text="@={item.allowedIPs}" />
 
         <TextView
@@ -115,7 +115,7 @@
             android:layout_alignParentStart="true"
             android:layout_below="@+id/endpoint_label"
             android:layout_toStartOf="@+id/persistent_keepalive_text"
-            android:inputType="textNoSuggestions"
+            android:inputType="textNoSuggestions|textVisiblePassword"
             android:text="@={item.endpoint}" />
 
         <TextView