diff --git a/SOURCES/more-classic-classic-mode.patch b/SOURCES/more-classic-classic-mode.patch
index 2e60b40..fca5599 100644
--- a/SOURCES/more-classic-classic-mode.patch
+++ b/SOURCES/more-classic-classic-mode.patch
@@ -1388,7 +1388,7 @@ index 0000000..ac4037b
 +var WorkspaceIndicator = class WorkspaceIndicator extends PanelMenu.Button {
 +    constructor() {
 +        super(0.0, _('Workspace Indicator'), true);
-+        this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM));
++        this.setMenu(new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.BOTTOM));
 +        this.actor.add_style_class_name('window-list-workspace-indicator');
 +        this.menu.actor.remove_style_class_name('panel-menu');
 +
diff --git a/SPECS/gnome-shell-extensions.spec b/SPECS/gnome-shell-extensions.spec
index c7ea5d2..a7e66a1 100644
--- a/SPECS/gnome-shell-extensions.spec
+++ b/SPECS/gnome-shell-extensions.spec
@@ -6,7 +6,7 @@
 
 Name:           gnome-shell-extensions
 Version:        3.28.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Modify and extend GNOME Shell functionality and behavior
 
 Group:          User Interface/Desktops
@@ -562,6 +562,10 @@ fi
 
 
 %changelog
+* Wed Jul 20 2020 Florian Müllner <fmuellner@redhat.com> - 3.28.1-12
+- Fix workspace switch in window-list outside GNOME Classic
+  Resolves: #1858717
+
 * Fri Dec 06 2019 Jonas Ådahl <jadahl@redhat.com> - 3.28.1-11
 - A couple of fixes to the classic backports
   Resolves: #1778270