diff --git a/panels_ipe/js/panels_ipe.js b/panels_ipe/js/panels_ipe.js
index 1f40698..505d7de 100644
--- a/panels_ipe/js/panels_ipe.js
+++ b/panels_ipe/js/panels_ipe.js
@@ -231,7 +231,9 @@ function DrupalPanelsIPE(cache_key, cfg) {
     // Perform visual effects in a particular sequence.
     // .show() + .hide() cannot have speeds associated with them, otherwise
     // it clears out inline styles.
-    $('.panels-ipe-on').show();
+    window.location.hash = '#panels-ipe-display-'+cache_key;
+    context = $('#panels-ipe-display-'+cache_key);
+    $('.panels-ipe-on', context).show();
     ipe.showForm();
     ipe.topParent.addClass('panels-ipe-editing');
 
diff --git a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
index fad0592..a933027 100644
--- a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -27,9 +27,9 @@ class panels_renderer_ipe extends panels_renderer_editor {
     $this->clean_key = ctools_cleanstring($this->display->cache_key);
     $button = array(
       '#type' => 'link',
-      '#title' => t('Customize this page'),
+      '#title' => t('Customize @title', array('@title' => $this->display->title)),
       '#href' => $this->get_url('save_form'),
-      '#id' => 'panels-ipe-customize-page',
+      '#id' => drupal_html_id('panels-ipe-customize-page'),
       '#attributes' => array(
         'class' => array('panels-ipe-startedit', 'panels-ipe-pseudobutton'),
       ),