diff --git a/concrete/src/Editor/CkeditorEditor.php b/concrete/src/Editor/CkeditorEditor.php
index <HASH>..<HASH> 100644
--- a/concrete/src/Editor/CkeditorEditor.php
+++ b/concrete/src/Editor/CkeditorEditor.php
@@ -5,6 +5,7 @@ use Concrete\Core\Site\Config\Liaison as Repository;
 use Concrete\Core\Http\Request;
 use Concrete\Core\Http\ResponseAssetGroup;
 use Concrete\Core\Localization\Localization;
+use Concrete\Core\Page\Theme\Theme as PageTheme;
 use Concrete\Core\Utility\Service\Identifier;
 use URL;
 use User;
@@ -84,9 +85,21 @@ EOL;
             if ($cp->canViewPage()) {
                 $pt = $c->getCollectionThemeObject();
                 if (is_object($pt)) {
-                    $obj->classes = $pt->getThemeEditorClasses();
+                    if ($pt->getThemeHandle()) {
+                        $obj->classes = $pt->getThemeEditorClasses();
+                    } else {
+                        $siteTheme = $pt::getSiteTheme();
+                        if (is_object($siteTheme)) {
+                            $obj->classes = $siteTheme->getThemeEditorClasses();
+                        }
+                    }
                 }
             }
+        } else {
+            $siteTheme = PageTheme::getSiteTheme();
+            if (is_object($siteTheme)) {
+                $obj->classes = $siteTheme->getThemeEditorClasses();
+            }
         }
 
         return $obj;
get theme editor classes when using CKEditor in dashboard single pages and non-pages