diff --git a/src/Plugin/DsLayout.php b/src/Plugin/DsLayout.php
index ef9da0f..614a232 100644
--- a/src/Plugin/DsLayout.php
+++ b/src/Plugin/DsLayout.php
@@ -142,22 +142,25 @@ class DsLayout extends LayoutDefault implements PluginFormInterface {
     $classes_access = (\Drupal::currentUser()->hasPermission('admin_classes'));
     $classes = Ds::getClasses();
     if (!empty($classes)) {
+      $layoutSettings = $this->getPluginDefinition()->get('settings') ?: [];
 
+      $default_layout_classes = isset($layoutSettings['classes']['layout_class']) ? $layoutSettings['classes']['layout_class'] : [];
       $form['ds_classes']['layout_class'] = [
         '#type' => 'select',
         '#multiple' => TRUE,
         '#options' => $classes,
         '#title' => $this->t('Class for layout'),
-        '#default_value' => !empty($configuration['classes']['layout_class']) ? $configuration['classes']['layout_class'] : [],
+        '#default_value' => !empty($configuration['classes']['layout_class']) ? $configuration['classes']['layout_class'] : $default_layout_classes,
       ];
 
       foreach ($regions as $region_name => $region_definition) {
+        $default_classes = isset($layoutSettings['classes'][$region_name]) ? $layoutSettings['classes'][$region_name] : [];
         $form['ds_classes'][$region_name] = [
           '#type' => 'select',
           '#multiple' => TRUE,
           '#options' => $classes,
           '#title' => $this->t('Class for @region', ['@region' => $region_definition['label']]),
-          '#default_value' => isset($configuration['classes'][$region_name]) ? $configuration['classes'][$region_name] : [],
+          '#default_value' => isset($configuration['classes'][$region_name]) ? $configuration['classes'][$region_name] : $default_classes,
         ];
       }
       if ($classes_access) {
