diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index 26566cd..df71b2d 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -40,7 +40,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
     'apply_source_formatting' => FALSE,
     'paste_auto_cleanup_on_paste' => FALSE,
     'css_setting' => 'theme',
-    'css_theme' => variable_get('node_admin_theme') ? variable_get('admin_theme') : variable_get('theme_default'),
+    'css_theme' => variable_get('node_admin_theme') ? variable_get('admin_theme') : variable_get('theme_default', 'bartik'),
     'css_path' => NULL,
     'css_classes' => NULL,
   );
diff --git a/wysiwyg.module b/wysiwyg.module
index ba1a074..c633d10 100644
--- a/wysiwyg.module
+++ b/wysiwyg.module
@@ -614,12 +614,10 @@ function wysiwyg_get_css($theme = '') {
 
   $themes = list_themes();
   if (empty($theme)) {
-    $theme = menu_get_custom_theme();
+    $theme = variable_get('node_admin_theme') ? variable_get('admin_theme') : variable_get('theme_default', 'bartik');
   }
-  if ($theme == 'wysiwyg_theme_admin') {
-    if ($admin_theme = variable_get('admin_theme') && drupal_theme_access($admin_theme)) {
-      $theme = $admin_theme;
-    }
+  elseif ($theme == 'wysiwyg_theme_admin' && $admin_theme = variable_get('admin_theme')) {
+    $theme = $admin_theme;
   }
   if (!$theme || !isset($themes[$theme])) {
     $theme = variable_get('theme_default', 'bartik');