diff --git a/js/messaging-handlers.js b/js/messaging-handlers.js
index 9d779cc9b..84cb45204 100644
--- a/js/messaging-handlers.js
+++ b/js/messaging-handlers.js
@@ -84,6 +84,9 @@ var onMessage = function(request, sender, callback) {
             break;
 
         case 'gotoPick':
+            // Picker launched from popup: clear context menu args
+            µb.contextMenuClientX = -1;
+            µb.contextMenuClientY = -1;
             µb.elementPickerExec(request.tabId);
             break;