diff --git a/plugins/btchipwallet.py b/plugins/btchipwallet.py
index c4c08d60..e2a7c204 100644
--- a/plugins/btchipwallet.py
+++ b/plugins/btchipwallet.py
@@ -218,6 +218,9 @@ class BTChipWallet(NewWallet):
         give_error("Not supported")
 
     def sign_message(self, address, message, password):
+        self.get_client() # prompt for the PIN before displaying the dialog if necessary
+        if not self.check_proper_device():
+            give_error('Wrong device or password')        
         address_path = self.address_id(address)
         waitDialog.start("Signing Message ...")
         aborted = False