diff --git a/webform.module b/webform.module
index 0f875d12..73afd26a 100644
--- a/webform.module
+++ b/webform.module
@@ -809,7 +809,6 @@ function webform_theme() {
     'webform_form' => array(
       'render element' => 'form',
       'template' => 'templates/webform-form',
-      'pattern' => 'webform_form_[0-9]+',
     ),
     'webform_confirmation' => array(
       'variables' => array('node' => NULL, 'sid' => NULL),
@@ -3569,6 +3568,7 @@ function template_preprocess_webform_form(&$vars) {
   elseif (isset($vars['form']['submission']['#value'])) {
     $vars['nid'] = $vars['form']['submission']['#value']->nid;
   }
+  $vars['theme_hook_suggestions'][] = 'webform_form__' . $vars['nid'];
 
   if (!empty($vars['form']['#node']->webform['conditionals']) && empty($vars['form']['preview'])) {
     module_load_include('inc', 'webform', 'includes/webform.conditionals');