diff --git a/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java b/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java
index f0d95f3..9909bb4 100644
--- a/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java
+++ b/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java
@@ -74,6 +74,7 @@ public class VaadinCreateUI extends UI implements EventBusListener, HasI18N {
 
     @Override
     protected void init(VaadinRequest request) {
+        setOverlayContainerLabel("");
         getPage().setTitle("Vaadin Create 23'");
         if (!getAccessControl().isUserSignedIn()) {
             MDC.clear();
@@ -244,12 +245,10 @@ public void detach() {
     @Override
     public void attach() {
         super.attach();
-        // Workaround: https://github.com/vaadin/framework/issues/5772
         getPage().getJavaScript().execute(
                 """
                         setTimeout(() => {
                             document.getElementsByClassName('v-tooltip')[0].style.zIndex=30001;
-                            document.getElementsByClassName('v-overlay-container')[0].removeAttribute('aria-label');
                         }, 200);
                         """);
     }
diff --git a/vaadincreate-ui/src/main/webapp/VAADIN/themes/vaadincreate/mixins/utilities.scss b/vaadincreate-ui/src/main/webapp/VAADIN/themes/vaadincreate/mixins/utilities.scss
index 15482d5..757e465 100644
--- a/vaadincreate-ui/src/main/webapp/VAADIN/themes/vaadincreate/mixins/utilities.scss
+++ b/vaadincreate-ui/src/main/webapp/VAADIN/themes/vaadincreate/mixins/utilities.scss
@@ -26,7 +26,7 @@
   // Experimental style for the grid with no visible cell focus.
   // This is not part of the Valo theme, but could be added to it.
   .no-cell-focus {
-    .v-grid-cell-focused:before {
+    td.v-grid-cell-focused:before {
       border: unset;
     }  
   }