diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index 1a8c9b13f90ce40d173e6bc3bd1818e089844cb2..d110230dc18195c1257ac6c9b12deafc26abd1c1 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -2,7 +2,7 @@ import {createInstance} from './i18n.js';
 import {html, css} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import {LanguageSelect} from '@dbp-toolkit/language-select';
-import {Icon, getShadowRootDocument} from '@dbp-toolkit/common';
+import {Icon} from '@dbp-toolkit/common';
 import {AuthKeycloak} from '@dbp-toolkit/auth';
 import {AuthMenuButton} from './auth-menu-button.js';
 import {Notification} from '@dbp-toolkit/notification';
@@ -828,7 +828,7 @@ export class AppShell extends ScopedElementsMixin(DBPLitElement) {
             this.defineScopedElement(activity.element, customElements.get(activity.element));
         });
 
-        let elm = getShadowRootDocument(this).createElement(activity.element);
+        let elm = this.createScopedElement(activity.element);
 
         this._onActivityAdded(elm);
         this._lastElm = elm;
diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js
index dfc508194555dd3701fbe816e302f5477cf24c1b..b1f14527b72f502100247c6667b5871231a1a698 100644
--- a/packages/file-handling/src/clipboard.js
+++ b/packages/file-handling/src/clipboard.js
@@ -4,7 +4,7 @@ import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import * as fileHandlingStyles from '@dbp-toolkit/file-handling/src/styles';
-import {Icon, getShadowRootDocument} from '@dbp-toolkit/common';
+import {Icon} from '@dbp-toolkit/common';
 import {TabulatorFull as Tabulator} from 'tabulator-tables';
 import {humanFileSize} from '@dbp-toolkit/common/i18next';
 import {name as pkgName} from '@dbp-toolkit/file-handling/package.json';
@@ -161,7 +161,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
                             let icon =
                                 `<${icon_tag} name="empty-file" class="nextcloud-picker-icon ` +
                                 `"></${icon_tag}>`;
-                            let div = getShadowRootDocument(this).createElement('div');
+                            let div = this.createScopedElement('div');
                             div.innerHTML = icon;
                             return div;
 
@@ -175,7 +175,7 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) {
                         field: 'name',
                         sorter: 'alphanum',
                         formatter: (cell) => {
-                            let div = getShadowRootDocument(this).createElement('div');
+                            let div = this.createScopedElement('div');
                             div.classList.add('filename');
                             div.innerHTML = cell.getValue();
                             return div;
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index 1c992c9937113624dea6054d9f69223f6821cb3c..b747c3c119b65c31b46e532ae01346d181e32123 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -2,7 +2,7 @@ import {createInstance} from './i18n';
 import {css, html} from 'lit';
 import {ScopedElementsMixin} from '@open-wc/scoped-elements';
 import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element';
-import {Icon, MiniSpinner, getShadowRootDocument} from '@dbp-toolkit/common';
+import {Icon, MiniSpinner} from '@dbp-toolkit/common';
 import * as commonUtils from '@dbp-toolkit/common/utils';
 import * as commonStyles from '@dbp-toolkit/common/styles';
 import {createClient, parseXML} from 'webdav/web';
@@ -216,7 +216,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                                 cell.getValue() === 'directory'
                                     ? `<${icon_tag} name="folder" class="nextcloud-picker-icon"></${icon_tag}>`
                                     : icon;
-                            let div = getShadowRootDocument(this).createElement('div');
+                            let div = this.createScopedElement('div');
                             div.innerHTML = html;
                             return div;
                         },
@@ -229,7 +229,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                         field: 'basename',
                         sorter: 'alphanum',
                         formatter: (cell) => {
-                            let div = getShadowRootDocument(this).createElement('div');
+                            let div = this.createScopedElement('div');
                             div.classList.add('filename');
                             div.innerHTML = cell.getValue();
                             return div;