diff --git a/verse/editor.py b/verse/editor.py
index e16c4ec..18c0cff 100644
--- a/verse/editor.py
+++ b/verse/editor.py
@@ -158,7 +158,7 @@ def CssPlaceholder(current_distribusi):
     distribusi = Distribusis.query.filter_by(
         distribusiname=current_distribusi
     ).first()
-    if distribusi is not None:
+    if distribusi is not None and distribusi.publictheme is not None:
         cssplaceholder = GetPublicCssFile(distribusi)
     else:
         with open("themes/editor/placeholder.css") as f:
diff --git a/verse/static/css/style.css b/verse/static/css/style.css
index d1fd796..f150127 100644
--- a/verse/static/css/style.css
+++ b/verse/static/css/style.css
@@ -102,7 +102,10 @@ fieldset.tagfield > input {
   width: 100%;
   max-width: 100%;
 }
-
+#publicthemes > ul {
+  max-height: 20em;
+  overflow: scroll;
+}
 input {
   border: none;
   background: #E0B0FF;
diff --git a/verse/templates/distribusiworkflow/theme.html b/verse/templates/distribusiworkflow/theme.html
index 2eeb099..1c448a1 100644
--- a/verse/templates/distribusiworkflow/theme.html
+++ b/verse/templates/distribusiworkflow/theme.html
@@ -25,7 +25,7 @@
   <hr>
   <form method="POST" enctype="multipart/form-data" action="{{ url_for('theme') }}">
     {{ publicthemeform.csrf_token }}
-    <fieldset class="required">
+    <fieldset id="publicthemes" class="required">
       {{ publicthemeform.publicthemes.label }}
       {{ publicthemeform.publicthemes }}
     </fieldset>