Index: build/chrome/cackey.js
==================================================================
--- build/chrome/cackey.js
+++ build/chrome/cackey.js
@@ -10,11 +10,12 @@
 
 /*
  * Optional features for CACKey
  */
 var cackeyFeatures = {
-	customPINPrompt: true
+	customPINPrompt: true,
+	useChromePINDialog: true
 };
 
 /*
  * Handle for the CACKey NaCl Target
  */
@@ -321,11 +322,11 @@
 			 * Set the handle to an invalid (but non-null) value until the window
 			 * is created in case we are invoked again soon.
 			 */
 			pinWindowPreviousHandle = "invalid";
 
-			if (messageEvent.data.originalrequest.signRequestId === null) {
+			if (messageEvent.data.originalrequest.signRequestId === null || cackeyFeatures.useChromePINDialog === false) {
 				chrome.app.window.create("pin.html", {
 					"id": "cackeyPINEntry",
 					"resizable": false,
 					"alwaysOnTop": true,
 					"focused": true,