diff --git a/comment_notify.module b/comment_notify.module
index bbd7843..e37a82b 100644
--- a/comment_notify.module
+++ b/comment_notify.module
@@ -118,8 +118,9 @@ function comment_notify_form_comment_form_alter(&$form, &$form_state, $form_id)
   $preference = comment_notify_get_user_comment_notify_preference($user->uid);
 
   // If you want to hide this on your site see http://drupal.org/node/322482
+  // Otherwise, the submit buttons will jump below the node preview.
   $form['notify_settings'] = array(
-    '#weight' => 19,
+    '#weight' => $form['actions']['#weight'] - 1,
   );
 
   $form['notify_settings']['notify'] = array(
@@ -138,9 +139,6 @@ function comment_notify_form_comment_form_alter(&$form, &$form_state, $form_id)
     $form['notify_settings']['notify_type']['#value'] = key($available_options);
   }
 
-  // Otherwise, the submit buttons will jump below the node preview.
-  $form['actions']['#weight'] = 19;
-
   // If this is an existing comment we set the default value based on their selection last time.
   if ($form['cid']['#value'] != '') {
     $notify = comment_notify_get_notification_type($form['cid']['#value']);