diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java b/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
index 5866956f..1b3db9cc 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Dialogs/ManualEntryDialog.java
@@ -36,6 +36,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TextView;
 
 import com.github.aakira.expandablelayout.ExpandableLayoutListenerAdapter;
 import com.github.aakira.expandablelayout.ExpandableLinearLayout;
@@ -72,6 +73,7 @@ public class ManualEntryDialog {
         final EditText issuerInput = inputView.findViewById(R.id.manual_issuer);
         final EditText labelInput = inputView.findViewById(R.id.manual_label);
         final EditText secretInput = inputView.findViewById(R.id.manual_secret);
+        final TextView secretView = inputView.findViewById(R.id.manual_secret_view);
         final EditText counterInput = inputView.findViewById(R.id.manual_counter);
         final EditText periodInput = inputView.findViewById(R.id.manual_period);
         final EditText digitsInput = inputView.findViewById(R.id.manual_digits);
@@ -299,7 +301,7 @@ public class ManualEntryDialog {
             typeInput.setSelection(typeAdapter.getPosition(oldType));
             issuerInput.setText(oldEntry.getIssuer());
             labelInput.setText(oldEntry.getLabel());
-            secretInput.setText(oldEntry.getSecretEncoded());
+            secretView.setText(oldEntry.getSecretEncoded());
             digitsInput.setText(Integer.toString(oldEntry.getDigits()));
             algorithmInput.setSelection(algorithmAdapter.getPosition(oldEntry.getAlgorithm()));
 
@@ -318,8 +320,15 @@ public class ManualEntryDialog {
                 e.printStackTrace();
             }
 
-            typeInput.setEnabled(false);
+            secretInput.setVisibility(View.GONE);
+            secretView.setVisibility(View.VISIBLE);
+
+            // Little hack: match the color and background of the TextView to that of a disabled EditText
             secretInput.setEnabled(false);
+            secretView.setBackground(secretInput.getBackground());
+            secretView.setTextColor(secretInput.getTextColors().getColorForState(secretInput.getDrawableState(), R.color.colorPrimary));
+
+            typeInput.setEnabled(false);
             digitsInput.setEnabled(false);
             algorithmInput.setEnabled(false);
             periodInput.setEnabled(false);
diff --git a/app/src/main/res/layout/dialog_manual_entry.xml b/app/src/main/res/layout/dialog_manual_entry.xml
index 3a144847..2016ac9f 100644
--- a/app/src/main/res/layout/dialog_manual_entry.xml
+++ b/app/src/main/res/layout/dialog_manual_entry.xml
@@ -86,13 +86,26 @@
                 android:layout_height="wrap_content"
                 android:text="@string/label_secret"/>
 
+            <TextView
+                android:id="@+id/manual_secret_view"
+                android:layout_weight="7"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="?attr/editTextBackground"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textIsSelectable="true"
+                android:fontFamily="monospace"
+                android:maxLines="3"
+                android:visibility="gone" />
+
             <EditText
                 android:id="@+id/manual_secret"
                 android:layout_weight="7"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:lines="3"
-                android:inputType="textVisiblePassword"
+                android:fontFamily="monospace"
+                android:inputType="textMultiLine"
+                android:maxLines="3"
                 android:hint="@string/hint_secret" />
 
         </LinearLayout>