diff --git a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
index 3f068031b..e8f46a37b 100644
--- a/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -148,22 +148,22 @@
                 </td>
             </tr>
         </table>
-            <div class="padding-small">
-                <label class="header"><%= scope.textCharacterSpacing %></label>
+        <div class="padding-small">
+            <label class="header"><%= scope.textCharacterSpacing %></label>
+        </div>
+        <div class="padding-large">
+            <div style="display: inline-block;">
+                <label class="input-label"><%= scope.textSpacing %></label>
+                <div id="paragraphadv-spin-spacing"></div>
             </div>
-            <div class="padding-large">
-                <div style="display: inline-block;">
-                    <label class="input-label"><%= scope.textSpacing %></label>
-                    <div id="paragraphadv-spin-spacing"></div>
-                </div>
-                <div class="text-only" style="display: inline-block; margin-left: 15px;">
-                    <label class="input-label"><%= scope.textPosition %></label>
-                    <div id="paragraphadv-spin-position"></div>
-                </div>
-            </div>
-            <div class="doc-content-color" style="outline: 1px solid #cbcbcb;">
-                <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
+            <div class="text-only" style="display: inline-block; margin-left: 15px;">
+                <label class="input-label"><%= scope.textPosition %></label>
+                <div id="paragraphadv-spin-position"></div>
             </div>
+        </div>
+        <div class="doc-content-color" style="outline: 1px solid #cbcbcb;">
+            <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
+        </div>
     </div>
 </div>
 <div id="id-adv-paragraph-tabs" class="settings-panel">
diff --git a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
index 7b0447e1c..286baadad 100644
--- a/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
+++ b/apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
@@ -58,18 +58,32 @@
         <div class="padding-small">
             <label class="header"><%= scope.textEffects %></label>
         </div>
-        <div>
-            <div class="padding-large" style="display: inline-block;">
-                <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
-                <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
-                <div id="paragraphadv-checkbox-superscript"></div>
-            </div>
-            <div class="padding-large" style="display: inline-block; padding-left: 40px;">
-                <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
-                <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
-                <div id="paragraphadv-checkbox-all-caps"></div>
-            </div>
-        </div>
+        <table cols="2">
+            <tr>
+                <td class="padding-small">
+                    <div id="paragraphadv-checkbox-strike"></div>
+                </td>
+                <td class="padding-small" style="padding-left: 40px;">
+                    <div id="paragraphadv-checkbox-subscript"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-small">
+                    <div id="paragraphadv-checkbox-double-strike"></div>
+                </td>
+                <td class="padding-small" style="padding-left: 40px;">
+                    <div id="paragraphadv-checkbox-small-caps"></div>
+                </td>
+            </tr>
+            <tr>
+                <td class="padding-large">
+                    <div id="paragraphadv-checkbox-superscript"></div>
+                </td>
+                <td class="padding-large" style="padding-left: 40px;">
+                    <div id="paragraphadv-checkbox-all-caps"></div>
+                </td>
+            </tr>
+        </table>
         <div class="padding-small">
             <label class="header"><%= scope.textCharacterSpacing %></label>
         </div>
diff --git a/apps/presentationeditor/main/app/view/DateTimeDialog.js b/apps/presentationeditor/main/app/view/DateTimeDialog.js
index d4f2d332d..59852eafa 100644
--- a/apps/presentationeditor/main/app/view/DateTimeDialog.js
+++ b/apps/presentationeditor/main/app/view/DateTimeDialog.js
@@ -176,7 +176,7 @@ define([
         },
 
         getFocusedComponents: function() {
-            return [this.cmbLang, {cmp: this.listFormats, selector: '.listview'}];
+            return [this.cmbLang, this.listFormats, this.chUpdate];
         },
 
         getDefaultFocusableComponent: function () {
diff --git a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
index 718d65979..3a9de16ef 100644
--- a/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
+++ b/apps/presentationeditor/main/app/view/HeaderFooterDialog.js
@@ -188,7 +188,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
         },
 
         getFocusedComponents: function() {
-            return [ this.cmbFormat, this.cmbLang, this.inputFixed, this.inputFooter ];
+            return [ this.chDateTime, this.cmbFormat, this.cmbLang, this.inputFixed, this.chSlide, this.chFooter, this.inputFooter, this.chNotTitle ];
         },
 
         getDefaultFocusableComponent: function () {
@@ -198,6 +198,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
                 return this.inputFixed;
             else if (!this.inputFooter.isDisabled())
                 return this.inputFooter;
+            else
+                return this.chDateTime;
         },
 
         focusControls: function() {
diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
index 7caa13da0..2b2c6424c 100644
--- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
@@ -223,7 +223,7 @@ define([    'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
         getFocusedComponents: function() {
             return [
                 this.spnWidth, this.spnHeight, this.spnX, this.spnY,// 0 tab
-                this.spnAngle,  // 1 tab
+                this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab
                 this.inputAltTitle, this.textareaAltDescription  // 2 tab
             ];
         },
diff --git a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
index bbd577d93..7989b1593 100644
--- a/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
@@ -409,8 +409,8 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
             return [
                 this.cmbTextAlignment, this.numIndentsLeft, this.numIndentsRight, this.cmbSpecial, this.numSpecialBy,
                 this.numSpacingBefore, this.numSpacingAfter, this.cmbLineRule, this.numLineHeight, // 0 tab
-                this.numSpacing, // 1 tab
-                this.numDefaultTab, this.numTab, this.cmbAlign, {cmp: this.tabList, selector: '.listview'} // 2 tab
+                this.chStrike, this.chSubscript, this.chDoubleStrike, this.chSmallCaps, this.chSuperscript, this.chAllCaps, this.numSpacing, // 1 tab
+                this.numDefaultTab, this.numTab, this.cmbAlign, this.tabList // 2 tab
             ];
         },
 
@@ -424,7 +424,7 @@ define([    'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
                         me.cmbTextAlignment.focus();
                         break;
                     case 1:
-                        me.numSpacing.focus();
+                        me.chStrike.focus();
                         break;
                     case 2:
                         me.numDefaultTab.focus();
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index a116cdc64..cb3a939a5 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -522,7 +522,7 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
         getFocusedComponents: function() {
             return [
                 this.spnWidth, this.spnHeight, // 0 tab
-                this.spnAngle,  // 1 tab
+                this.spnAngle, this.chFlipHor, this.chFlipVert, // 1 tab
                 this.cmbCapType, this.cmbJoinType, // 2 tab
                 this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight, // 3 tab
                 this.spnColumns, this.spnSpacing, // 4 tab
diff --git a/apps/presentationeditor/main/app/view/SlideshowSettings.js b/apps/presentationeditor/main/app/view/SlideshowSettings.js
index a9abd396a..c50b01b2f 100644
--- a/apps/presentationeditor/main/app/view/SlideshowSettings.js
+++ b/apps/presentationeditor/main/app/view/SlideshowSettings.js
@@ -85,6 +85,14 @@ define([
             $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
         },
 
+        getFocusedComponents: function() {
+            return [ this.chLoop ];
+        },
+
+        getDefaultFocusableComponent: function () {
+            return this.chLoop;
+        },
+
         _handleInput: function(state) {
             if (this.options.handler) {
                 this.options.handler.call(this, this, state);
diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
index 5418b1aa3..9e3f0b99b 100644
--- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
@@ -317,7 +317,7 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
 
         getFocusedComponents: function() {
             return [
-                this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight,
+                this.chCellMargins, this.spnMarginTop, this.spnMarginLeft, this.spnMarginBottom, this.spnMarginRight,
                 this.spnTableMarginTop, this.spnTableMarginLeft, this.spnTableMarginBottom, this.spnTableMarginRight, // 0 tab
                 this.inputAltTitle, this.textareaAltDescription  // 1 tab
             ];