diff --git a/CHANGES.md b/CHANGES.md
index 1d2a807f968..b36099c67cc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Fixed Issues:
* [#10879](http://dev.ckeditor.com/ticket/10879): Remove format should not leak from nested editable.
* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: WebSpellChecker fails to apply changes if nested editable was focused.
* [#10870](http://dev.ckeditor.com/ticket/10870): Fixed: `paste` command is not being disabled when clipboard is empty any more.
+* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the Image2 dialog.
## CKEditor 4.3 Beta
diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 573e3f8407c..a6ae585b291 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2335,6 +2335,10 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
}
});
+ // Completes this object with everything we have in the
+ // definition.
+ CKEDITOR.tools.extend( this, elementDefinition );
+
// Register the object as a tab focus if it can be included.
if ( this.keyboardFocusable ) {
this.tabIndex = elementDefinition.tabIndex || 0;
@@ -2344,10 +2348,6 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
dialog._.currentFocusIndex = me.focusIndex;
});
}
-
- // Completes this object with everything we have in the
- // definition.
- CKEDITOR.tools.extend( this, elementDefinition );
},
/**
diff --git a/plugins/dialogui/plugin.js b/plugins/dialogui/plugin.js
index 55f04e32fe9..6166ca04615 100644
--- a/plugins/dialogui/plugin.js
+++ b/plugins/dialogui/plugin.js
@@ -130,9 +130,19 @@ CKEDITOR.plugins.add( 'dialogui', {
var innerHTML = function() {
var html = [],
requiredClass = elementDefinition.required ? ' cke_required' : '';
- if ( elementDefinition.labelLayout != 'horizontal' )
- html.push( '', '