diff --git a/devtools/client/responsive.html/browser/tunnel.js b/devtools/client/responsive.html/browser/tunnel.js
index 73d2d12a46aa..7c35d201a5d4 100644
--- a/devtools/client/responsive.html/browser/tunnel.js
+++ b/devtools/client/responsive.html/browser/tunnel.js
@@ -362,11 +362,19 @@ MessageManagerTunnel.prototype = {
   OUTER_TO_INNER_MESSAGE_PREFIXES: [
     // Messages sent from DevTools
     "debug:",
+    // Messages sent from findbar.xml
+    "Findbar:",
+    // Messages sent from RemoteFinder.jsm
+    "Finder:",
   ],
 
   INNER_TO_OUTER_MESSAGE_PREFIXES: [
     // Messages sent to DevTools
     "debug:",
+    // Messages sent to findbar.xml
+    "Findbar:",
+    // Messages sent to RemoteFinder.jsm
+    "Finder:",
   ],
 
   OUTER_TO_INNER_FRAME_SCRIPTS: [