diff --git a/lib/exe/css.php b/lib/exe/css.php
index 715d32885bad86678f1938af0c173923d4e473e8..061df662d9cccb58e20f54ffc4539e1167dfea2c 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -55,6 +55,9 @@ function css_out(){
         $files[DOKU_CONF.'userprint.css'] = '';
     }else{
         $files[DOKU_INC.'lib/styles/style.css'] = DOKU_BASE.'lib/styles/';
+        if($conf['spellchecker']){
+            $files[DOKU_INC.'lib/styles/spellcheck.css'] = DOKU_BASE.'lib/styles/';
+        }
         if (isset($tplstyles['screen'])) $files = array_merge($files, $tplstyles['screen']);
         if($lang['direction'] == 'rtl'){
             if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']);
diff --git a/lib/styles/spellcheck.css b/lib/styles/spellcheck.css
new file mode 100644
index 0000000000000000000000000000000000000000..c2d43e0cd36dcc2431b9d27f0306c6a6603129e3
--- /dev/null
+++ b/lib/styles/spellcheck.css
@@ -0,0 +1,27 @@
+/**
+ * Basic styles for the spellchecker. Only included when the spellchek option
+ * is enabled. These styles are the absolute minimum to make the spellchecker
+ * work. Templates should add addional styles for making it look nice.
+ */
+
+div.dokuwiki div#spell__suggest {
+  position: absolute;
+  left: 0;
+  top: 0;
+  display: none;
+  z-index: 2;
+}
+
+div.dokuwiki div#spell__result {
+  display:none;
+  font-family:monospace;
+  overflow: auto;
+  z-index: 1;
+
+  white-space: pre-wrap;       /* css-3 */
+  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+  white-space: -pre-wrap;      /* Opera 4-6 */
+  white-space: -o-pre-wrap;    /* Opera 7 */
+  word-wrap: break-word;       /* Internet Explorer 5.5+ */
+}
+
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index b4698736975c38ac25bdf6f59745ee9db257ed34..f23166c2149bd6ba23e16497f9bee066266a1abf 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -154,6 +154,7 @@ div.dokuwiki input.button, div.dokuwiki button.button{
   /* \*/
   display: inline;
   /* */
+
 }
 
 * html div.dokuwiki input.button, * html div.dokuwiki button.button{
@@ -730,33 +731,18 @@ div.dokuwiki a.spell_error {
 }
 
 div.dokuwiki div#spell__suggest {
-  position: absolute;
-  left: 0;
-  top: 0;
-  display: none;
   background-color: __white__;
   padding: 2px;
   border: 1px solid __black__;
   font-size:80%;
-  z-index: 2;
 }
 
 div.dokuwiki div#spell__result {
-  display:none;
-  font-family:monospace;
   border: 1px solid __dark__;
   color: Black;
   font-size:14px;
   padding: 3px;
   background-color: __lighter__;
-  overflow: auto;
-  z-index: 1;
-
-  white-space: pre-wrap;       /* css-3 */
-  white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-  white-space: -pre-wrap;      /* Opera 4-6 */
-  white-space: -o-pre-wrap;    /* Opera 7 */
-  word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 div.dokuwiki span.spell_noerr {