diff --git editors/js/tinymce-3.js editors/js/tinymce-3.js
index c90ffd5..8a1bacd 100644
--- editors/js/tinymce-3.js
+++ editors/js/tinymce-3.js
@@ -12,23 +12,33 @@
  *   An object containing editor settings for each input format.
  */
 Drupal.wysiwyg.editor.init.tinymce = function(settings) {
-  // @see #454992: drupal_get_js() must not use 'q' as query string.
-  if (tinymce.query == 'q') {
-    tinymce.query = '';
-  }
-  // If JS compression is enabled, TinyMCE is unable to autodetect its global
-  // settinge, hence we need to define them manually.
-  // @todo Move global library settings somewhere else.
-  tinyMCE.baseURL = settings.global.editorBasePath;
-  tinyMCE.srcMode = (settings.global.execMode == 'src' ? '_src' : '');
-  tinyMCE.gzipMode = (settings.global.execMode == 'gzip');
+  // If TinyMCE's gzip compressor is used, initialization of global instance
+  // settings needs to be delayed until the aggregated and compressed archive is
+  // loaded via tinyMCE_GZ.init().
+  var loaded = (settings.global.execMode != 'gzip');
 
   // Initialize editor configurations.
   for (var format in settings) {
     if (format == 'global') {
       continue;
-    };
-    tinyMCE.init(settings[format]);
+    }
+    if (!loaded) {
+      // @todo Does this work with different configurations of external/Drupal
+      //   plugins?
+      // @todo What about JS compression + tinyMCE.baseURL? Will likely break.
+      tinyMCE_GZ.init(settings[format]);
+      loaded = true;
+    }
+    else {
+      // If JS compression is enabled, TinyMCE is unable to autodetect its
+      // global settings, hence we need to define them manually.
+      tinyMCE.baseURL = settings.global.editorBasePath;
+      tinyMCE.srcMode = (settings.global.execMode == 'src' ? '_src' : '');
+      tinyMCE.gzipMode = (settings.global.execMode == 'gzip');
+
+      tinyMCE.init(settings[format]);
+    }
+
     if (Drupal.settings.wysiwyg.plugins[format]) {
       // Load native external plugins.
       // Array syntax required; 'native' is a predefined token in JavaScript.
diff --git editors/tinymce.inc editors/tinymce.inc
index fad0c2d..385350c 100644
--- editors/tinymce.inc
+++ editors/tinymce.inc
@@ -26,6 +26,10 @@ function wysiwyg_tinymce_editor() {
         'title' => 'Source',
         'files' => array('tiny_mce_src.js'),
       ),
+      'gzip' => array(
+        'title' => 'Compressed',
+        'files' => array('tiny_mce_gzip.js'),
+      ),
     ),
     'version callback' => 'wysiwyg_tinymce_version',
     'themes callback' => 'wysiwyg_tinymce_themes',
@@ -64,6 +68,12 @@ function wysiwyg_tinymce_editor() {
             'title' => 'Source',
             'files' => array('tiny_mce_src.js'),
           ),
+          'gzip' => array(
+            'title' => 'Compressed',
+            'files' => array(
+              'tiny_mce_gzip.js' => array('preprocess' => FALSE),
+            ),
+          ),
         ),
       ),
     ),
