diff --git a/webapp/packages/core/placeholder/package.json b/webapp/packages/core/placeholder/package.json
deleted file mode 100644
index b30e59d21c..0000000000
--- a/webapp/packages/core/placeholder/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "@dbeaver/core/placeholder",
-  "private": true,
-  "sideEffects": false,
-  "main": "../dist/placeholder",
-  "module": "../dist/placeholder",
-  "types": "../dist/types/placeholder"
-}
diff --git a/webapp/packages/core/src/app/TopNavBar/TopNavBar.tsx b/webapp/packages/core/src/app/TopNavBar/TopNavBar.tsx
index b933511b8f..f1ac6baa5f 100644
--- a/webapp/packages/core/src/app/TopNavBar/TopNavBar.tsx
+++ b/webapp/packages/core/src/app/TopNavBar/TopNavBar.tsx
@@ -8,8 +8,8 @@
 
 import styled from 'reshadow';
 
+import { Placeholder } from '@dbeaver/core/blocks';
 import { useService } from '@dbeaver/core/di';
-import { Placeholder } from '@dbeaver/core/placeholder';
 import { useStyles } from '@dbeaver/core/theming';
 
 import { TopNavService } from './TopNavBarService';
diff --git a/webapp/packages/core/src/app/TopNavBar/TopNavBarService.ts b/webapp/packages/core/src/app/TopNavBar/TopNavBarService.ts
index 9a2ef8fb6b..5c913a2f93 100644
--- a/webapp/packages/core/src/app/TopNavBar/TopNavBarService.ts
+++ b/webapp/packages/core/src/app/TopNavBar/TopNavBarService.ts
@@ -6,8 +6,8 @@
  * you may not use this file except in compliance with the License.
  */
 
+import { PlaceholderContainer } from '@dbeaver/core/blocks';
 import { injectable } from '@dbeaver/core/di';
-import { PlaceholderContainer } from '@dbeaver/core/placeholder';
 
 import { ConnectionSelector } from './ConnectionSchemaManager/ConnectionSelector/ConnectionSelector';
 import { Fill } from './Fill';
diff --git a/webapp/packages/core/src/placeholder/Placeholder.tsx b/webapp/packages/core/src/blocks/Placeholder/Placeholder.tsx
similarity index 100%
rename from webapp/packages/core/src/placeholder/Placeholder.tsx
rename to webapp/packages/core/src/blocks/Placeholder/Placeholder.tsx
diff --git a/webapp/packages/core/src/placeholder/PlaceholderContainer.ts b/webapp/packages/core/src/blocks/Placeholder/PlaceholderContainer.ts
similarity index 82%
rename from webapp/packages/core/src/placeholder/PlaceholderContainer.ts
rename to webapp/packages/core/src/blocks/Placeholder/PlaceholderContainer.ts
index 1468bb2236..52c589a657 100644
--- a/webapp/packages/core/src/placeholder/PlaceholderContainer.ts
+++ b/webapp/packages/core/src/blocks/Placeholder/PlaceholderContainer.ts
@@ -45,13 +45,13 @@ export class PlaceholderContainer<T = unknown> {
   }
 
   private findPosition(order: number) {
-    for (let i = 0; i < this.placeholders.length; i++) {
-      const placeholder = this.placeholders[i];
-      if (placeholder.order === undefined || order <= placeholder.order) {
-        return i;
-      }
+    const position = this.placeholders
+      .findIndex(placeholder => placeholder.order === undefined || order <= placeholder.order);
+
+    if (position === -1) {
+      return this.placeholders.length;
     }
 
-    return this.placeholders.length;
+    return position;
   }
 }
diff --git a/webapp/packages/core/src/blocks/index.ts b/webapp/packages/core/src/blocks/index.ts
index c4d1f4138d..a688b5421a 100644
--- a/webapp/packages/core/src/blocks/index.ts
+++ b/webapp/packages/core/src/blocks/index.ts
@@ -18,3 +18,5 @@ export * from './SanitizedHTML/SanitizedHTML';
 export * from './ItemList';
 export * from './PropertiesTable';
 export * from './IconButton';
+export * from './Placeholder/Placeholder';
+export * from './Placeholder/PlaceholderContainer';
diff --git a/webapp/packages/core/src/placeholder/index.ts b/webapp/packages/core/src/placeholder/index.ts
deleted file mode 100644
index 8ad57847cd..0000000000
--- a/webapp/packages/core/src/placeholder/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './Placeholder';
-export * from './PlaceholderContainer';
diff --git a/webapp/packages/dbeaver/configs/webpack/common.js b/webapp/packages/dbeaver/configs/webpack/common.js
index 350ce97b62..9ccdce2354 100644
--- a/webapp/packages/dbeaver/configs/webpack/common.js
+++ b/webapp/packages/dbeaver/configs/webpack/common.js
@@ -49,7 +49,6 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
       "@dbeaver/core/extensions": path.resolve(__dirname, "../../../core/src/extensions"),
       "@dbeaver/core/product": path.resolve(__dirname, "../../../core/src/product"),
       "@dbeaver/core/plugin": path.resolve(__dirname, "../../../core/src/plugin"),
-      "@dbeaver/core/placeholder": path.resolve(__dirname, "../../../core/src/placeholder"),
 
       // rewrite imports for unnecessary work in `web/src/libs/sdk.ts`
       'graphql-tag': path.join(__dirname, '../../fix-gql.js'),