diff --git a/webform.module b/webform.module
index a0ff2b8..3864639 100644
--- a/webform.module
+++ b/webform.module
@@ -1622,7 +1622,7 @@ function webform_client_form(&$form_state, $node, $submission, $is_draft = FALSE
 
   // Set the form action to the node ID in case this is being displayed on the
   // teaser, subsequent pages should be on the node page directly.
-  if (!isset($node->webform_block) && empty($submission)) {
+  if (!isset($node->webform_block) && empty($submission) && ($node->webform['teaser'] == 1)) {
     $query = $_GET;
     unset($query['q']);
     $form['#action'] = url('node/'. $node->nid, array('query' => $query));