diff --git a/panels_ipe/panels_ipe.module b/panels_ipe/panels_ipe.module
index a11fc3a..2d3e0dc 100644
--- a/panels_ipe/panels_ipe.module
+++ b/panels_ipe/panels_ipe.module
@@ -53,10 +53,26 @@ function panels_ipe_theme() {
     'panels_ipe_toolbar' => array(
       'variables' => array('buttons' => NULL),
     ),
+    'panels_ipe_pane_outer_wrapper' => array(
+      'variables' => array('output' => NULL, 'pane' => NULL),
+    ),
   );
 }
 
 /**
+ * Outer wrapper for the pane contents.
+ */
+function theme_panels_ipe_pane_outer_wrapper($vars) {
+  $output = $vars['output'];
+  $pane = $vars['pane'];
+  if (!empty($vars['pane']->locks['type']) && $pane->locks['type'] == 'immovable') {
+    return "<div id=\"panels-ipe-paneid-{$pane->pid}\" class=\"panels-ipe-nodrag panels-ipe-portlet-wrapper panels-ipe-portlet-marker\">" . $output . "</div>";
+  }
+
+  return "<div id=\"panels-ipe-paneid-{$pane->pid}\" class=\"panels-ipe-portlet-wrapper panels-ipe-portlet-marker\">" . $output . "</div>";
+}
+
+/**
  * Theme the 'placeholder' pane, which is shown on an active IPE when no panes
  * live in that region.
  *
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 5f33fcd..d484899 100644
--- a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -130,11 +130,7 @@ class panels_renderer_ipe extends panels_renderer_editor {
     // Hand it off to the plugin/theme for placing draggers/buttons
     $output = theme('panels_ipe_pane_wrapper', array('output' => $output, 'pane' => $pane, 'display' => $this->display, 'renderer' => $this));
 
-    if (!empty($pane->locks['type']) && $pane->locks['type'] == 'immovable') {
-      return "<div id=\"panels-ipe-paneid-{$pane->pid}\" class=\"panels-ipe-nodrag panels-ipe-portlet-wrapper panels-ipe-portlet-marker\">" . $output . "</div>";
-    }
-
-    return "<div id=\"panels-ipe-paneid-{$pane->pid}\" class=\"panels-ipe-portlet-wrapper panels-ipe-portlet-marker\">" . $output . "</div>";
+    return theme('panels_ipe_pane_outer_wrapper', array('output' => $output, 'pane' => $pane));
   }
 
   function prepare_panes($panes) {