diff --git a/plugins/styles/semantic_panels.inc b/plugins/styles/semantic_panels.inc
index 9e9e17d..44bfd41 100644
--- a/plugins/styles/semantic_panels.inc
+++ b/plugins/styles/semantic_panels.inc
@@ -114,6 +114,13 @@ function semantic_panels_pane_settings_form($settings) {
     '#default_value' => $settings['element_title']['type'],
     '#fieldset' => 'element_title',
   );
+  $form['element_title']['add_default_classes'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add default classes'),
+    '#description' => t('If checked default classes will be added on this element.'),
+    '#default_value' => isset($settings['element_title']['add_default_classes'])?$settings['element_title']['add_default_classes']:true,
+    '#fieldset' => 'element_title',  
+  );
   $form['element_title']['class_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add CSS class(es)'),
@@ -145,6 +152,13 @@ function semantic_panels_pane_settings_form($settings) {
     '#default_value' => $settings['element_content']['type'],
     '#fieldset' => 'element_content',
   );
+  $form['element_content']['add_default_classes'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add default classes'),
+    '#description' => t('If checked default classes will be added on this element.'),
+    '#default_value' => isset($settings['element_content']['add_default_classes'])?$settings['element_content']['add_default_classes']:true,
+    '#fieldset' => 'element_content',  
+  );
   $form['element_content']['class_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add CSS class(es)'),
@@ -176,6 +190,13 @@ function semantic_panels_pane_settings_form($settings) {
     '#default_value' => $settings['element_wrapper']['type'],
     '#fieldset' => 'element_wrapper',
   );
+  $form['element_wrapper']['add_default_classes'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add default classes'),
+    '#description' => t('If checked default classes will be added on this element. Without default classes contextual links won\'t work,'),
+    '#default_value' => isset($settings['element_wrapper']['add_default_classes'])?$settings['element_wrapper']['add_default_classes']:true,
+    '#fieldset' => 'element_wrapper',  
+  );
   $form['element_wrapper']['class_enable'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add CSS class(es)'),
@@ -193,15 +214,6 @@ function semantic_panels_pane_settings_form($settings) {
   );
   _semantic_panels_get_attributes_fieldset($form, $settings, 'element_wrapper');
 
-  // Default classes.
-  $form['add_default_classes'] = array(
-    '#type' => 'checkbox',
-    '#title' => t('Add default classes'),
-    '#default_value' => !empty($settings['add_default_classes']),
-    '#description' => t('If checked default classes will be added on every element. They will always be added to the wrapper element (to not break contextual links).'),
-    '#weight' => 3,
-  );
-
   return $form;
 }
 
@@ -307,7 +319,11 @@ function template_preprocess_semantic_panels_pane(&$vars) {
 
   if(!empty($vars['wrapper_type'])){
 
-    if (!empty($pane_semantic_settings['element_wrapper']['class'])) {
+    if (!$vars['settings']['element_wrapper']['add_default_classes']) {
+      $vars['classes_array'] = array();
+    }
+
+    if ($pane_semantic_settings['element_wrapper']['class_enable'] && !empty($pane_semantic_settings['element_wrapper']['class'])) {
       $vars['classes_array'][] = $pane_semantic_settings['element_wrapper']['class'];
     }
 
diff --git a/semantic_panels.module b/semantic_panels.module
index bb47256..6729a84 100644
--- a/semantic_panels.module
+++ b/semantic_panels.module
@@ -89,7 +89,7 @@ function _semantic_panels_get_html($element_key, $element_data, $pane_semantic_s
 
   if ($element_settings['type']) {
     $class = '';
-    if ($pane_semantic_settings['add_default_classes']) {
+    if ($element_settings['add_default_classes']) {
       $class = $element_data['default_classes'];
     }
 
@@ -131,4 +131,4 @@ function _semantic_panels_get_type($type_setting, $default_type = 'div') {
   if ($type_setting) {
     return check_plain($type_setting);
   }
-}
\ No newline at end of file
+}
diff --git a/templates/semantic-panels-pane.tpl.php b/templates/semantic-panels-pane.tpl.php
index af1d32e..bf0a792 100644
--- a/templates/semantic-panels-pane.tpl.php
+++ b/templates/semantic-panels-pane.tpl.php
@@ -5,7 +5,7 @@
  */
 ?>
 <?php if ($wrapper_type): ?>
-  <<?php print $wrapper_type; ?> class="<?php print $classes; ?>" <?php print $id; ?> <?php print $attributes; ?>>
+  <<?php print $wrapper_type; ?> <?php if (isset($classes)) : ?>class="<?php print $classes; ?>"<?php endif; ?> <?php print $id; ?> <?php print $attributes; ?>>
 <?php endif; ?>
 
     <?php if ($admin_links): ?>