--- old/layout.vm	2007-12-22 05:00:54.000000000 +0200
+++ new/layout.vm	2008-01-12 14:49:34.000000000 +0200
@@ -178,11 +178,11 @@
           <label for="decorators">$messages.getString("portal.page.editing.portlet.decorator")</label>
           <select id="decorators" name="decorators">
             <option value=''>
-        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
                 #set ($fd = "")
-                #if (!$f.Decorator)
+                #if ($f.Decorator)
                     #set ($fd = $f.Decorator)
                 #end
+        	    #foreach($pd in $decorationFactory.getPortletDecorations($rc))
             <option value='$pd' #if ($pd == $fd) SELECTED #end>$pd
         	    #end
           </select>
@@ -332,7 +332,7 @@
                   <select id='decorator' name='decorator' onChange="$form$dcnt$submit">
                     <option value=''>
 	                #set ($fd = "")
-	                #if (!$f.Decorator)
+	                #if ($f.Decorator)
 	                    #set ($fd = $f.Decorator)
 	                #end
                     #foreach($pd in $decorationFactory.getPortletDecorations($rc))