diff --git a/README.md b/README.md
index fb9c4a2..3fb9964 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ https://kaltura.github.io/playkit-js-common
 - `dev` watch on file changes and build modules
 - `release` bump package version and add changes from commits into CHANGELOG
 - `pushTaggedRelease` push latest tag to GitHub repo
+- `storybook:install` install dependencies of storybook submodule
 - `storybook` run dev-server for storybook (https://storybook.js.org/docs/preact/get-started/introduction)
 - `storybook:build` create static files for storybook
 - `storybook:deploy` push storybook static files to GitHub pages
diff --git a/src/hoc/overlay-portal/index.tsx b/src/hoc/overlay-portal/index.tsx
index c5f3971..f86c314 100644
--- a/src/hoc/overlay-portal/index.tsx
+++ b/src/hoc/overlay-portal/index.tsx
@@ -32,13 +32,13 @@ export class OverlayPortal extends Component<OverlayPortalProps> {
   playerContainer: any = document.getElementById(this.props.targetId!) || document;
 
   componentWillUnmount() {
-    // keep playkit-overlay-active class in case OverlayPortal has more children
-    if (this.playerContainer.querySelector(`${PORTAL_CLASS} > ${PLAYKIT_OVERLAY_CLASS}`)) {
-      // use timeout 0 to make sure addPlayerClass happens after removePlayerClass
-      setTimeout(() => {
+    setTimeout(() => {
+      if (this.playerContainer.querySelector(`${PORTAL_CLASS} > ${PLAYKIT_OVERLAY_CLASS}`)) {
+        // keep .playkit-overlay-active class in case OverlayPortal has playkit-ui Overlay as children
         this.props.addPlayerClass!();
-      }, 0);
-    }
+      }
+      // use timeout 0 to make sure check happens after components updated
+    }, 0);
   }
 
   render() {