diff --git a/CHANGES.rst b/CHANGES.rst
index f616493..86616d6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,14 @@
 Changes
 =======
 
+0.7.1 (2012-05-18)
+------------------
+
+Fixes:
+
+- loading template editor in-place over current page
+
+
 0.7 (2012-05-18)
 ----------------
 
diff --git a/flask_debugtoolbar/static/js/toolbar.js b/flask_debugtoolbar/static/js/toolbar.js
index 0245ad0..a1b80d0 100644
--- a/flask_debugtoolbar/static/js/toolbar.js
+++ b/flask_debugtoolbar/static/js/toolbar.js
@@ -175,10 +175,19 @@
             var uarr = String.fromCharCode(0x25b6);
             var darr = String.fromCharCode(0x25bc);
             elem.html(elem.html() == uarr ? darr : uarr);
+        },
+        load_href: function(href) {
+          $.get(href, function(data, status, xhr) {
+            document.open();
+            document.write(xhr.responseText);
+            document.close();
+          });
+          return false;
         }
     };
     $(document).ready(function() {
         fldt.init();
     });
+    window.fldt = fldt;
 
 })(jQuery.noConflict(true));
diff --git a/flask_debugtoolbar/templates/panels/template.html b/flask_debugtoolbar/templates/panels/template.html
index dadae78..3505e89 100644
--- a/flask_debugtoolbar/templates/panels/template.html
+++ b/flask_debugtoolbar/templates/panels/template.html
@@ -1,16 +1,6 @@
 {% if templates %}
     {% if editable %}
-    <script>
-        function loadHref() {
-          $.get(this.href, function(data, status, xhr) {
-            document.open();
-            document.write(xhr.responseText);
-            document.close();
-          });
-          return false;
-        }
-    </script>
-    <a href="/_debug_toolbar/views/template/{{ key }}" onclick="return loadHref.apply(this);">Edit templates</a>
+    <a href="/_debug_toolbar/views/template/{{ key }}" onclick="return fldt.load_href(this.href);">Edit templates</a>
     {% endif %}
     {% for template in templates %}
         <h4>{{ template.template.name }}</h4>
diff --git a/setup.py b/setup.py
index 971d4e5..11c24f2 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ except:
 
 setup(
     name='Flask-DebugToolbar',
-    version='0.7',
+    version='0.7.1',
     url='http://github.com/mgood/flask-debugtoolbar',
     license='BSD',
     author='Michael van Tellingen',