diff --git a/pywb/rewrite/regex_rewriters.py b/pywb/rewrite/regex_rewriters.py
index 2de788d7..a9328c51 100644
--- a/pywb/rewrite/regex_rewriters.py
+++ b/pywb/rewrite/regex_rewriters.py
@@ -127,8 +127,10 @@ class JSLinkAndLocationRewriter(JSLinkOnlyRewriter):
              (r'(?<!/)\blocation\b', RegexRewriter.add_prefix(prefix), 0),
              (r'(?<=document\.)domain', RegexRewriter.add_prefix(prefix), 0),
              (r'(?<=document\.)referrer', RegexRewriter.add_prefix(prefix), 0),
-             (r'(?<!/)\btop\b', RegexRewriter.add_prefix(prefix), 0),
-             #(r'(?<=window\.)top', RegexRewriter.add_prefix(prefix), 0),
+
+             (r'(?<=window\.)top', RegexRewriter.add_prefix(prefix), 0),
+             (r'\b(top)\b[!=\W]+(?:self|window)', RegexRewriter.add_prefix(prefix), 1),
+             (r'(?:self|window)[!=\W]+\b(top)\b', RegexRewriter.add_prefix(prefix), 1),
         ]
         #import sys
         #sys.stderr.write('\n\n*** RULES:' + str(rules) + '\n\n')
diff --git a/pywb/static/wombat.js b/pywb/static/wombat.js
index 1792119e..b62c4b0f 100644
--- a/pywb/static/wombat.js
+++ b/pywb/static/wombat.js
@@ -553,7 +553,7 @@ WB_wombat_init = (function() {
             setInterval(check_all_locations, 500);
         }
         
-        var is_framed = (window.top.update_wb_url != undefined);
+        var is_framed = (window.top.wbinfo && window.top.wbinfo.is_frame);
 
         if (window.self.location != window.top.location) {
             if (is_framed) {