Index: ajax_comments.js
===================================================================
--- ajax_comments.js	(revision 3723)
+++ ajax_comments.js	(working copy)
@@ -197,7 +197,7 @@
     $(this).addClass('last-clicked');
     $('#comment-form-content').attr('cid', link_cid);
   }
-  else {
+  else if(!($(this).is('#comment-form-title') && (Drupal.settings.always_expand_main_form))) {
     // Handling double click.
     if ((!$(this).is('#comment-form-title')) && (Drupal.settings.always_expand_main_form)) {
       $('#comment-form-title').click();
@@ -300,7 +300,10 @@
     if (reload) {
       ajax_comments_reload_form(pid);
     }
-  });
+    if(Drupal.settings.always_expand_main_form) {
+      $('#comment-form-title').click();
+    }
+  });  
   $('.pressed').removeClass('pressed');
   $('#comment-form-content').attr('cid', -1);
   ajax_comments_hide_progress();