diff --git a/discover_overlay/discover_overlay.py b/discover_overlay/discover_overlay.py
index 0a7c642..f66ea20 100755
--- a/discover_overlay/discover_overlay.py
+++ b/discover_overlay/discover_overlay.py
@@ -21,7 +21,7 @@ from .voice_overlay import VoiceOverlayWindow
 from .text_overlay import TextOverlayWindow
 from .discord_connector import DiscordConnector
 gi.require_version("Gtk", "3.0")
-# pylint: disable=wrong-import-position
+# pylint: disable=wrong-import-position,wrong-import-order
 from gi.repository import Gtk, GLib, Gio
 
 try:
diff --git a/discover_overlay/draggable_window_wayland.py b/discover_overlay/draggable_window_wayland.py
index fefa742..c587381 100644
--- a/discover_overlay/draggable_window_wayland.py
+++ b/discover_overlay/draggable_window_wayland.py
@@ -15,7 +15,11 @@ import cairo
 import gi
 gi.require_version("Gtk", "3.0")
 # pylint: disable=wrong-import-position
-from gi.repository import Gtk, Gdk, GtkLayerShell
+from gi.repository import Gtk, Gdk
+try:
+    from gi.repository import GtkLayerShell
+except ImportError:
+    pass
 
 
 class DraggableWindowWayland(Gtk.Window):
diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py
index 9f1109d..5639462 100644
--- a/discover_overlay/overlay.py
+++ b/discover_overlay/overlay.py
@@ -17,7 +17,11 @@ import gi
 import cairo
 gi.require_version("Gtk", "3.0")
 # pylint: disable=wrong-import-position
-from gi.repository import Gtk, Gdk, GtkLayerShell
+from gi.repository import Gtk, Gdk
+try:
+    from gi.repository import GtkLayerShell
+except ImportError:
+    pass
 
 
 class OverlayWindow(Gtk.Window):