Ticket #7467: 7467.patch

_source/plugins/wysiwygarea/plugin.js

@@ -366 +366 @@
                         activateEditing( editor );
 
                         // Ensure bogus br could help to move cursor (out of styles) to the end of block. (#7041)
-                        var pathBlock = path.block || path.blockLimit;
-                        if ( pathBlock && !pathBlock.getBogus() )
+                        var pathBlock = path.block || path.blockLimit,
+                                lastNode = pathBlock && pathBlock.getLast( isNotEmpty );
+
+                        // In case it's not ended with block element and doesn't have bogus yet. (#7467)
+                        if ( pathBlock && !( lastNode && lastNode.isBlockBoundary() ) && !pathBlock.getBogus() )
                         {
                                 editor.fire( 'updateSnapshot' );
                                 restoreDirty( editor );