--- panels_node.module.orig	2009-04-30 22:09:58.000000000 +0200
+++ panels_node.module	2009-05-04 01:31:07.265625000 +0200
@@ -125,11 +125,11 @@ function panels_node_add() {
  */
 function panels_node_form(&$node, &$param) {
   $form['panels_node']['#tree'] = TRUE;
-  if (empty($node->nid)) {
+  if (empty($node->nid) && empty($param)) {
     // Grab our selected layout from the $node, If it doesn't exist, try arg(3)
     // and if that doesn't work present them with a list to pick from.
     $panel_layout = isset($node->panel_layout) ? $node->panel_layout : arg(3);
-    if (empty($panel_layout)) {
+    if (!isset($panel_layout)) {
       return drupal_goto('node/add/panel/choose-layout');
     }
 
@@ -164,7 +164,6 @@ function panels_node_form(&$node, &$para
     );
   }
 
-//  drupal_set_message('<pre>' . check_plain(var_export($node, true)) . '</pre>');
   $css_id = '';
   if (!empty($node->panels_node['css_id'])) {
     $css_id = $node->panels_node['css_id'];