--- a/browser/extensions/pocket/content/main.js
+++ b/browser/extensions/pocket/content/main.js
@@ -303,17 +303,17 @@ var pktUI = (function() {
      */
     function resizePanel(options) {
         var iframe = getPanelFrame();
         var subview = getSubview();
 
         if (subview) {
           // Use the subview's size
           iframe.style.width = "100%";
-          iframe.style.height = subview.clientHeight + "px";
+          iframe.style.height = subview.parentNode.clientHeight + "px";
         } else {
           // Set an explicit size, panel will adapt.
           iframe.style.width  = options.width  + "px";
           iframe.style.height = options.height + "px";
         }
     }
 
     /**
@@ -530,22 +530,17 @@ var pktUI = (function() {
             frame.id = 'pocket-panel-iframe';
             frame.setAttribute("type", "content");
             frameParent.appendChild(frame);
         }
         return frame;
     }
 
     function getSubview() {
-        var frame = getPanelFrame();
-        var view = frame;
-        while (view && view.localName != "panelview") {
-            view = view.parentNode;
-        }
-
+        var view = document.getElementById("PanelUI-pocketView");
         if (view && view.getAttribute("current") == "true")
             return view;
         return null;
     }
 
     function isInOverflowMenu() {
         var subview = getSubview();
         return !!subview;