diff --git a/src/app/content/components/Page/PageContent.tsx b/src/app/content/components/Page/PageContent.tsx
index a50a0198e5..b780df1100 100644
--- a/src/app/content/components/Page/PageContent.tsx
+++ b/src/app/content/components/Page/PageContent.tsx
@@ -109,7 +109,7 @@ export default styled(MainContent)`
       }
 
       @media screen {
-        &.focus {
+        &[aria-current] {
           background-color: ${style.focused};
           border-bottom: 0.2rem solid ${style.focusBorder};
           padding: 0.2rem 0 0;
@@ -138,7 +138,7 @@ export default styled(MainContent)`
         background-color: #ffea00;
       }
 
-      &.focus {
+      &[aria-current] {
         ${SELF_AND_CHILD_MATH_SELECTOR} {
           background-color: #ff9e4b;
           padding: 0.2rem 0;
diff --git a/src/app/messages/en/messages.json b/src/app/messages/en/messages.json
index 77e114abd4..70a60066c5 100644
--- a/src/app/messages/en/messages.json
+++ b/src/app/messages/en/messages.json
@@ -61,8 +61,10 @@
   "i18n:footer:social:tw:alt": "twitter",
   "i18n:highlighter:highlight:end": "End of {style} highlight",
   "i18n:highlighter:highlight:start": "Start {style} highlight",
+  "i18n:highlighter:highlight:start-selected": "Start selected {style} highlight",
   "i18n:highlighter:highlight:end:search": "End of search result",
   "i18n:highlighter:highlight:start:search": "Start search result",
+  "i18n:highlighter:highlight:start-selected:search": "Start selected search result",
   "i18n:highlighting:button:cancel": "Cancel",
   "i18n:highlighting:button:delete": "Delete",
   "i18n:highlighting:button:save": "Save",
diff --git a/src/app/messages/es/messages.json b/src/app/messages/es/messages.json
index dfa1bfabe8..d563e06480 100644
--- a/src/app/messages/es/messages.json
+++ b/src/app/messages/es/messages.json
@@ -59,8 +59,10 @@
   "i18n:footer:social:tw:alt": "Twitter",
   "i18n:highlighter:highlight:end": "Final de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}",
   "i18n:highlighter:highlight:start": "Comienzo de texto resaltado {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}}",
+  "i18n:highlighter:highlight:start-selected": "Start selected {style, select, blue {azul} green {verde} pink {rosado} purple {morado} yellow {amarillo} other {{style}}} highlight",
   "i18n:highlighter:highlight:end:search": "Final de resultado de búsqueda",
   "i18n:highlighter:highlight:start:search": "Comienzo de resultado de búsqueda",
+  "i18n:highlighter:highlight:start-selected:search": "Start search result",
   "i18n:highlighting:button:cancel": "Cancelar",
   "i18n:highlighting:button:delete": "Eliminar",
   "i18n:highlighting:button:save": "Guardar",
diff --git a/src/app/messages/pl/messages.json b/src/app/messages/pl/messages.json
index b8519ec7bf..1106f81f1d 100644
--- a/src/app/messages/pl/messages.json
+++ b/src/app/messages/pl/messages.json
@@ -59,8 +59,10 @@
   "i18n:footer:social:tw:alt": "twitter",
   "i18n:highlighter:highlight:end": "Koniec {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia",
   "i18n:highlighter:highlight:start": "Początek {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia",
+  "i18n:highlighter:highlight:start-selected": "Start selected {style, select, blue {niebieskiego} green {zielonego} pink {różowego} purple {fioletowego} yellow {żółtego} other {{style}}} zakreślenia",
   "i18n:highlighter:highlight:end:search": "Koniec zakreślenia wyniku wyszukiwania",
   "i18n:highlighter:highlight:start:search": "Początek zakreślenia wyniku wyszukiwania",
+  "i18n:highlighter:highlight:start-selected:search": "Start search result",
   "i18n:highlighting:button:cancel": "Anuluj",
   "i18n:highlighting:button:delete": "Usuń",
   "i18n:highlighting:button:save": "Zachowaj",