diff --git a/context_admin.module b/context_admin.module
index 3a62c16..1c69088 100644
--- a/context_admin.module
+++ b/context_admin.module
@@ -248,6 +248,23 @@ function context_admin_node_add_wrapper($type, $fields = array(), $use_panels =
 }
 
 /**
+ * Build own node_edit form as well.
+ */
+function context_admin_node_edit_wrapper($node, $type, $use_panels = FALSE) {
+  $type_name = node_type_get_name($node);
+  drupal_set_title(t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH);
+  if ($use_panels && module_exists('panels')) {
+    // Render form using Page Manager's node/%node/edit page
+    // Requires node/%node/edit page to be enabled.  Check for this and disable checkbox above?  FIXME
+    ctools_include("plugins");
+    $plugin = ctools_get_plugins("page_manager", "tasks", "node_edit");
+    return page_manager_node_edit($node);
+  }
+  $page = page_manager_get_current_page();
+  return drupal_get_form('context_admin_node_form_wrapper', $node, $page);
+}
+
+/**
  * Custom wrapper for node_form() so that we do not have to load node.pages.inc
  * from a menu item. Being forced into loading it in the menu prevents any
  * other module from being able to abstractly utilize node_add() since all
diff --git a/plugins/context_admin/node_edit_menu.inc b/plugins/context_admin/node_edit_menu.inc
index 13c3ab6..ff38f82 100644
--- a/plugins/context_admin/node_edit_menu.inc
+++ b/plugins/context_admin/node_edit_menu.inc
@@ -47,16 +47,5 @@ function context_admin_node_edit_menu_render_page($handler, $contexts, $args, $t
   if (isset($handler->conf['context_admin_use_node_edit'])) {
     $use_panels = $handler->conf['context_admin_use_node_edit'];
   }
-  if ($use_panels && module_exists('panels')) {
-    // Render form using Page Manager's node/%node/edit page
-    // Requires node/%node/edit page to be enabled.  Check for this and disable checkbox above?  FIXME
-    ctools_include("plugins");
-    $plugin = ctools_get_plugins("page_manager", "tasks", "node_edit");
-    global $user;
-    $type_name = node_type_get_name($node);
-    drupal_set_title(t('<em>Edit @type</em> @title', array('@type' => $type_name, '@title' => $node->title)), PASS_THROUGH);
-    return page_manager_node_edit($node);
-  }
-  module_load_include('inc', 'node', 'node.pages');
-  return node_page_edit($node);
+  return context_admin_node_edit_wrapper($node, $use_panels);
 }