diff --git a/panopoly_wysiwyg.module b/panopoly_wysiwyg.module
index 6c5029d..fbeb456 100755
--- a/panopoly_wysiwyg.module
+++ b/panopoly_wysiwyg.module
@@ -92,15 +92,17 @@ function panopoly_wysiwyg_element_info_alter(&$type) {
  */
 function panopoly_wysiwyg_filter_process_format($element) {
 
-  // Set the element above the WYSIWYG textarea
-  $element['format']['#weight'] = 1;
-  $element['format']['#prefix'] = '<div class="format-toggle">';
-  $element['format']['#suffix'] = '</div><div class="clearfix"></div>';
-  unset($element['format']['#type']);
-  $element['format']['format']['#title'] = 'Editor: ';
-  
+  // Do not auto submit the form due to changes of the filter
+  $element['format']['format']['#attributes']['class'][] = 'ctools-auto-submit-exclude';
+
   // Do not show the guidelines and help text for text formatters
+  // Also format this all a bit different so that it looks right
   if (!variable_get('panopoly_wysiwyg_show_format_details', FALSE)) {
+    $element['format']['#weight'] = 1;
+    $element['format']['#prefix'] = '<div class="format-toggle">';
+    $element['format']['#suffix'] = '</div><div class="clearfix"></div>';
+    unset($element['format']['#type']);
+    $element['format']['format']['#title'] = 'Editor: ';
     $element['format']['help']['#access'] = FALSE;
     $element['format']['guidelines']['#access'] = FALSE;
   }