diff --git a/modules/media_wysiwyg/media_wysiwyg.ckeditor.inc b/modules/media_wysiwyg/media_wysiwyg.ckeditor.inc
index 3434d1d..ba6af8f 100644
--- a/modules/media_wysiwyg/media_wysiwyg.ckeditor.inc
+++ b/modules/media_wysiwyg/media_wysiwyg.ckeditor.inc
@@ -5,6 +5,12 @@
  * Provides WYSIWYG integration for CKEditor.
  */
 
+// Include required js if CKEditor module is installed.
+if (module_exists('ckeditor')) {
+  require_once dirname(__FILE__) . '/wysiwyg_plugins/media.inc';
+  media_wysiwyg_include_browser_js();
+}
+
 /**
  * Implements hook_ckeditor_plugin_alter().
  */
@@ -14,3 +20,4 @@ function media_wysiwyg_ckeditor_plugin_alter(&$plugins) {
     $plugins['media']['path'] = drupal_get_path('module', 'media_wysiwyg') . '/wysiwyg_plugins/media_ckeditor/';
   }
 }
+
diff --git a/modules/media_wysiwyg/media_wysiwyg.module b/modules/media_wysiwyg/media_wysiwyg.module
index fc97230..5e73a6a 100644
--- a/modules/media_wysiwyg/media_wysiwyg.module
+++ b/modules/media_wysiwyg/media_wysiwyg.module
@@ -14,6 +14,9 @@ require_once dirname(__FILE__) . '/includes/media_wysiwyg.filter.inc';
 // Functions for UUID support to embedded media.
 require_once dirname(__FILE__) . '/includes/media_wysiwyg.uuid.inc';
 
+// Functions for CKEditor module to support embedded media.
+require_once dirname(__FILE__) . '/media_wysiwyg.ckeditor.inc';
+
 /**
  * Implements hook_hook_info().
  */