diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecExceptionHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecExceptionHandler.kt
index bbf1fb645..5d50737f9 100644
--- a/aztec/src/main/kotlin/org/wordpress/aztec/AztecExceptionHandler.kt
+++ b/aztec/src/main/kotlin/org/wordpress/aztec/AztecExceptionHandler.kt
@@ -65,7 +65,6 @@ class AztecExceptionHandler(private var logHelper: WeakReference<ExceptionHandle
                 visualEditor.get()?.externalLogger?.logException(DynamicLayoutGetBlockIndexOutOfBoundsException("Error #8828", ex))
             }
         }
-
         rootHandler?.uncaughtException(thread, ex)
     }
 
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
index c2800b632..e07f91646 100644
--- a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
+++ b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -1891,6 +1891,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     return super.onTextContextMenuItem(id)
                 }
             }
+            android.R.id.selectAll -> {
+                return if (text.toString() == Constants.END_OF_BUFFER_MARKER.toString()) {
+                    deleteInlineStyleFromTheBeginning()
+                    return true
+                } else {
+                    super.onTextContextMenuItem(id)
+                }
+            }
             else -> return super.onTextContextMenuItem(id)
         }