diff --git a/inline_messages.admin.inc b/inline_messages.admin.inc
index f7c882e..f637418 100644
--- a/inline_messages.admin.inc
+++ b/inline_messages.admin.inc
@@ -115,6 +115,14 @@ function inline_messages_admin_settings() {
     '#default_value' => variable_get('inline_messages_formids', NULL),
     '#description' => t('Enter one %form_id per line.', $tokens),
   );
+
+  $form['inline_messages_scrollto']['inline_messages_scrollto_target'] = array(
+    '#type'          => 'radios',
+    '#title'         => t('Scroll target'),
+    '#default_value' => variable_get('inline_messages_scrollto_target', 0),
+    '#description'   => t('Scroll target where to scroll to'),
+    '#options'       => array(t('Form'), t('Errors')),
+   );
   
   $form['#validate'][] = 'inline_messages_settings_validate';
   return system_settings_form($form);
diff --git a/inline_messages.module b/inline_messages.module
index 89cb3b6..7edfa32 100644
--- a/inline_messages.module
+++ b/inline_messages.module
@@ -120,7 +120,8 @@ function inline_messages_form_alter(&$form, &$form_state, $form_id) {
       
       $settings = array(
         'duration' => (int) variable_get('inline_messages_scrollto_duration', 0),
-        'offset' => (int) variable_get('inline_messages_scrollto_offset', 0)
+        'offset' => (int) variable_get('inline_messages_scrollto_offset', 0),
+        'target' => (int) variable_get('inline_messages_scrollto_target', 0),
       );
       drupal_add_js(array('inline_messages_scrollto' => $settings), 'setting');
       drupal_add_js(variable_get('inline_messages_scrollto_path', SCROLLTO_PATH_DEFAULT), array('group' => JS_LIBRARY));
diff --git a/js/inline_messages.js b/js/inline_messages.js
index f8ffe72..344ace9 100644
--- a/js/inline_messages.js
+++ b/js/inline_messages.js
@@ -19,7 +19,8 @@
         if ($('#toolbar').length) {
           var pos = pos - $('#toolbar').height();
         }
-        $.scrollTo(pos, $settings['duration'], {offset:$settings['offset']});
+        var $target = $settings['target'] == 0 ? $form_id : $('#inline-messages');
+        $.scrollTo($target, $settings['duration'], {offset:$settings['offset']});
       }
     }