diff --git a/internal/ui/switcher.go b/internal/ui/switcher.go
index dba65e2e..09cac29d 100644
--- a/internal/ui/switcher.go
+++ b/internal/ui/switcher.go
@@ -207,7 +207,7 @@ func (s *Switcher) loadIcons(list []fynedesk.Window) []fyne.CanvasObject {
 	var ret []fyne.CanvasObject
 
 	for _, item := range list {
-		if item.Desktop() != fynedesk.Instance().Desktop() {
+		if item.Desktop() != fynedesk.Instance().Desktop() && !item.Pinned() {
 			continue
 		}
 		ret = append(ret, newSwitchIcon(s, item))
diff --git a/internal/x11/wm/switcher.go b/internal/x11/wm/switcher.go
index cb37f0d5..5d01b6f7 100644
--- a/internal/x11/wm/switcher.go
+++ b/internal/x11/wm/switcher.go
@@ -72,7 +72,7 @@ func (x *x11WM) previousAppSwitcher() {
 func (x *x11WM) showOrSelectAppSwitcher(reverse bool) {
 	var visible []fynedesk.Window
 	for _, win := range x.clients {
-		if win.Desktop() == fynedesk.Instance().Desktop() && !win.Iconic() {
+		if win.Desktop() == fynedesk.Instance().Desktop() || win.Pinned() {
 			visible = append(visible, win)
 		}
 	}