diff --git a/packages/survey-creator-core/src/components/page.scss b/packages/survey-creator-core/src/components/page.scss
index ab228e6951..c2a4222f75 100644
--- a/packages/survey-creator-core/src/components/page.scss
+++ b/packages/survey-creator-core/src/components/page.scss
@@ -107,7 +107,7 @@ svc-page {
   }
   //hovered and focused state
   &:hover,
-  &:focus {
+  &:focus-visible {
     background-color: var(--ctr-survey-page-toolbar-item-background-color-hovered, $background-dim);
   }
 
diff --git a/packages/survey-creator-core/src/components/question.scss b/packages/survey-creator-core/src/components/question.scss
index 3909b42f77..9d7b2c9e55 100644
--- a/packages/survey-creator-core/src/components/question.scss
+++ b/packages/survey-creator-core/src/components/question.scss
@@ -1328,7 +1328,7 @@ svc-question,
   background-color: transparent;
 
   &:hover,
-  &:focus {
+  &:focus-visible {
     opacity: initial;
     background-color: var(--ctr-survey-question-panel-toolbar-item-background-color-hovered, $background-dim);
   }