diff --git a/plugins/entity/PanelizerEntityNode.class.php b/plugins/entity/PanelizerEntityNode.class.php
index b43261c..d512c6b 100644
--- a/plugins/entity/PanelizerEntityNode.class.php
+++ b/plugins/entity/PanelizerEntityNode.class.php
@@ -183,6 +183,15 @@ public function hook_page_alter(&$page) {
     }
   }
 
+  /**
+   * Implements a delegated hook_admin_paths.
+   */
+  public function hook_admin_paths(&$items) {
+    if (variable_get('node_admin_theme')) {
+      $items['node/*/panelizer*'] = TRUE;
+    }
+  }
+
   public function preprocess_panelizer_view_mode(&$vars, $entity, $element, $panelizer, $info) {
     parent::preprocess_panelizer_view_mode($vars, $entity, $element, $panelizer, $info);
 
diff --git a/tests/panelizer.node.test b/tests/panelizer.node.test
index c74b1b0..4ea2cc7 100644
--- a/tests/panelizer.node.test
+++ b/tests/panelizer.node.test
@@ -84,11 +84,6 @@ function testPageConfiguration() {
       $this->assertText(t('No default display has been configured for this view mode.'));
     }
 
-    // Confirm the node page is not using the admin theme.
-    $this->drupalGet('node/' . $node->nid);
-    $this->assertResponse(200);
-    $this->assertNoRaw('themes/seven/style.css', 'The node page is not using the admin theme.');
-
     // Check that the view mode can be panelized.
     $this->drupalGet('node/' . $node->nid . '/panelizer');
     $this->assertResponse(200);
@@ -96,9 +91,6 @@ function testPageConfiguration() {
     $this->assertLink('panelize', 0, 'The panelize link for the view mode appears on the page');
     $this->assertLinkByHref('node/' . $node->nid . '/panelizer/' . $view_mode, 0, 'A link to panelize the view mode appears on the page');
 
-    // Confirm the Panelizer pages are being used.
-    $this->assertRaw('themes/seven/style.css', 'The node Panelizer page is using the admin theme.');
-
     // Verify that the view mode is not currently panelized.
     $this->drupalGet('node/' . $node->nid . '/panelizer/' . $view_mode);
     $this->assertRaw(t('This %entity is not currently panelized.', array('%entity' => 'Node')));
@@ -437,4 +429,50 @@ function testViewModeReassignment() {
     $this->assertEqual(count($elements), 1, "The node is now using the teaser view mode's display.");
   }
 
+  /**
+   * Verify that the admin theme is displayed appropriately.
+   */
+  function testNodePanelizerAdminTheme() {
+    $content_type = 'page';
+    $view_mode = 'default';
+
+    // Panelize "Basic page" content type.
+    $edit = array(
+      'panelizer[status]' => TRUE,
+    );
+    $this->drupalPost('admin/structure/types/manage/' . $content_type, $edit, t('Save content type'));
+
+    // Create a test node.
+    $node = $this->createNode();
+
+    // Check that the post has been panelized.
+    $this->drupalGet('node/' . $node->nid);
+    $this->assertLink('Customize display', 0, 'The customize display link appears on the page');
+    $this->assertLinkByHref('node/' . $node->nid . '/panelizer', 0, 'A link to customize the node appears on the page');
+
+    // Confirm the node page is not using the admin theme.
+    $this->assertNoRaw('themes/seven/style.css', 'The node page is not using the admin theme.');
+
+    // Check that the view mode can be panelized.
+    $this->drupalGet('node/' . $node->nid . '/panelizer');
+    $this->assertResponse(200);
+    $this->assertText(t('Changes made here will override the default (Panelizer) displays and will only affect this @entity.', array('@entity' => 'node')));
+
+    // Confirm the Panelizer pages are being used. By default node_admin_theme
+    // is set to TRUE, so the admin theme should be used.
+    $this->assertRaw('themes/seven/style.css', 'The node Panelizer page is using the admin theme.');
+
+    // Override the admin theme setting.
+    variable_set('node_admin_theme', FALSE);
+
+    // Load the same Panelizer page again.
+    $this->drupalGet('node/' . $node->nid . '/panelizer');
+    $this->assertResponse(200);
+    $this->assertText(t('Changes made here will override the default (Panelizer) displays and will only affect this @entity.', array('@entity' => 'node')));
+
+    // Confirm the Panelizer pages are being used. By default node_admin_theme
+    // is set to TRUE, so the admin theme should be used.
+    $this->assertNoRaw('themes/seven/style.css', 'The node Panelizer page is no longer using the admin theme as it was disabled for node edit pages.');
+  }
+
 }