diff --git a/src/js/components/modal/Passphrase.js b/src/js/components/modal/Passphrase.js
index 92010cbf..007f1e2f 100644
--- a/src/js/components/modal/Passphrase.js
+++ b/src/js/components/modal/Passphrase.js
@@ -39,7 +39,7 @@ export default class PinModal extends Component<Props, State> {
         let singleInput = false;
         if (selected && selected.path === device.path) {
             deviceLabel = selected.instanceLabel;
-            singleInput = selected.remember;
+            singleInput = selected.remember || selected.state !== null;
         }
 
         this.state = {