--- webform.module.orig 2009-11-20 16:45:18.569851652 -0600
+++ webform.module      2009-11-20 16:49:40.518012540 -0600
@@ -1129,13 +1129,18 @@ function webform_client_form(&$form_stat
       '#prefix' => '<div class="webform-submission-navigation">',
       '#suffix' => '</div>',
     );
+    if (arg(0) == 'print') {
+      $startpath = 'print';
+    }
+    else {
+      $startpath = 'node';
+    }
     $form['navigation']['previous'] = array(
-      '#value' => $previous ? l(t('Previous submission'), 'node/'. $node->nid .'/submission/'. $previous . ($enabled ? '/edit' : '') , array('attributes' => array('class' => 'webform-submission-previous'), 'query' => ($enabled ? 'destination=node/'. $node->nid .'/submission/'. $previous .'/edit' : NULL))) : '<span class="webform-submission-previous">'. t('Previous submission') .'</span>',
+      '#value' => $previous ? l(t('Previous submission'), $startpath .'/'. $node->nid .'/submission/'. $previous . ($enabled ? '/edit' : '') , array('attributes' => array('class' => 'webform-submission-previous'), 'query' => ($enabled ? 'destination=node/'. $node->nid .'/submission/'. $previous .'/edit' : NULL))) : '<span class="webform-submission-previous">'. t('Previous submission') .'</span>',
     );
     $form['navigation']['next'] = array(
-      '#value' => $next ? l(t('Next submission'), 'node/'. $node->nid .'/submission/'. $next . ($enabled ? '/edit' : ''), array('attributes' => array('class' => 'webform-submission-next'), 'query' => ($enabled ? 'destination=node/'. $node->nid .'/submission/'. $next .'/edit' : NULL))) : '<span class="webform-submission-next">'. t('Next submission') .'</span>',
+      '#value' => $next ? l(t('Next submission'), $startpath .'/'. $node->nid .'/submission/'. $next . ($enabled ? '/edit' : ''), array('attributes' => array('class' => 'webform-submission-next'), 'query' => ($enabled ? 'destination=node/'. $node->nid .'/submission/'. $next .'/edit' : NULL))) : '<span class="webform-submission-next">'. t('Next submission') .'</span>',
     );
-
     $form['submission_info'] = array(
       '#title' => t('Submission Information'),
       '#type' => 'fieldset',

