diff -ru panels-7x-3.0-alpha3/panels_node/panels_node.module panels/panels_node/panels_node.module
--- panels-7x-3.0-alpha3/panels_node/panels_node.module	2011-03-17 00:52:07.000000000 +0100
+++ panels/panels_node/panels_node.module	2011-05-15 18:13:59.928261924 +0200
@@ -183,8 +183,11 @@
     // 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)) {
-      $opts = $_GET;
-      unset($opts['q']);
+      $opts = array(
+        'query' => $_GET
+      );
+      unset($opts['query']['q']);
+      unset($_GET['destination']);
       return drupal_goto('node/add/panel/choose-layout', $opts);
     }
 
