diff --git a/debian/changelog b/debian/changelog
index 50a41a3..0ee60a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-shell-extension-zorin-taskbar (68.2) noble; urgency=medium
+
+  * Corrected code to detect Tiling Shell gap offset
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Sat, 10 May 2025 23:52:12 +0100
+
 gnome-shell-extension-zorin-taskbar (68.1) noble; urgency=medium
 
   * Adjusted app icon margins and padding
diff --git a/src/extension.js b/src/extension.js
index 18c5351..ffa9018 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -42,6 +42,7 @@ let zorinDashDelayId = 0
 export let DTP_EXTENSION = null
 export let SETTINGS = null
 export let TILINGSETTINGS = null
+export let SHELLSETTINGS = null
 export let DESKTOPSETTINGS = null
 export let TERMINALSETTINGS = null
 export let NOTIFICATIONSSETTINGS = null
@@ -69,6 +70,9 @@ export default class ZorinTaskbarExtension extends Extension {
     } catch (e) {
       console.log(e)
     }
+    SHELLSETTINGS = new Gio.Settings({
+      schema_id: 'org.gnome.shell',
+    })
     DESKTOPSETTINGS = new Gio.Settings({
       schema_id: 'org.gnome.desktop.interface',
     })
@@ -135,6 +139,7 @@ export default class ZorinTaskbarExtension extends Extension {
 
     DTP_EXTENSION = null
     SETTINGS = null
+    SHELLSETTINGS = null
     DESKTOPSETTINGS = null
     TERMINALSETTINGS = null
     panelManager = null
diff --git a/src/panel.js b/src/panel.js
index 15f5591..32fc5f6 100644
--- a/src/panel.js
+++ b/src/panel.js
@@ -59,6 +59,7 @@ import * as Transparency from './transparency.js'
 import {
   SETTINGS,
   TILINGSETTINGS,
+  SHELLSETTINGS,
   DESKTOPSETTINGS,
   PERSISTENTSTORAGE,
   EXTENSION_PATH,
@@ -1078,7 +1079,7 @@ export const Panel = GObject.registerClass(
 
         if (
           TILINGSETTINGS != null &&
-          Main.extensionManager._extensionOrder.includes(ZORIN_TILING_SHELL_UUID) &&
+          SHELLSETTINGS.get_strv('enabled-extensions').includes(ZORIN_TILING_SHELL_UUID) &&
           TILINGSETTINGS.get_uint('outer-gaps') > 0
         ) {
           let position = this.getPosition()