diff --git a/twitter_post/twitter_post.module b/twitter_post/twitter_post.module
index c38f321..0b91b92 100644
--- a/twitter_post/twitter_post.module
+++ b/twitter_post/twitter_post.module
@@ -131,7 +131,15 @@ function twitter_post_form_alter(&$form, $form_state, $form_id) {
     $default_format = !empty($default_format) ? $default_format 
       : variable_get('twitter_post_default_format', 'New post: !title !tinyurl');
 
-    $form['twitter']['status']['#default_value'] = $default_format;
+    if (isset($form_state['values']['twitter']['status'])) {
+      $form['twitter']['status']['#default_value'] = $form_state['values']['twitter']['status'];
+      if ($form_state['values']['twitter']['post'] == 1) {
+        $form['twitter']['post']['#default_value'] = true;
+      }
+    } else {
+      $form['twitter']['status']['#default_value'] = $default_format;
+    }
+    
     $form['twitter']['status']['#description'] = t('The given text will be posted to twitter.com. You can use !url, !url-alias, !tinyurl, !title and !user as replacement text.  If the token module is enabled, you may also choose from the tokens listed in the replacement patterns section.');
     $form['twitter']['status']['#maxlength'] = 150;