diff --git a/modules/openlayers_ui/includes/openlayers_ui.presets.inc b/modules/openlayers_ui/includes/openlayers_ui.presets.inc
index 6dc0c76..a040ae7 100644
--- a/modules/openlayers_ui/includes/openlayers_ui.presets.inc
+++ b/modules/openlayers_ui/includes/openlayers_ui.presets.inc
@@ -297,6 +297,8 @@ function openlayers_ui_presets_form(&$form_state, $preset = NULL, $edit = FALSE)
   // Overlay layers
   $overlay_options = openlayers_ui_get_layer_options('overlay', $defaults['projection']);
   $form['layerstyles']['layers']['overlaylabels'] = array();
+  $form['layerstyles']['layer_styles']['#tree'] = TRUE;
+  $form['layerstyles']['layer_weight']['#tree'] = TRUE;
   if (!empty($overlay_options)) {
 
     // Have enabled layers maintain their order
@@ -308,8 +310,6 @@ function openlayers_ui_presets_form(&$form_state, $preset = NULL, $edit = FALSE)
     $overlay_options_keys = array_merge($disabled, $enabled);
 
     $nextweight = -10;
-    $form['layerstyles']['layer_styles']['#tree'] = TRUE;
-    $form['layerstyles']['layer_weight']['#tree'] = TRUE;
     foreach ($overlay_options_keys as $id) {
       $description = $overlay_options[$id];
       $form['layerstyles']['layers']['overlaylabels'][$id] = array('#type' => 'markup', '#value' => $description);