diff --git a/DesktopCube@yare/CHANGELOG.md b/DesktopCube@yare/CHANGELOG.md
index 3ae806d9..88882606 100644
--- a/DesktopCube@yare/CHANGELOG.md
+++ b/DesktopCube@yare/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.0.5
+
+- 2nd attempt to fix a bug that occurs when a windows workspace can't be determined
+- Make windows that are 'visible on all workspaces' also visible on all cube faces
+- Release the key press/release event listeners when the cube is destroyed
+
 ## 2.0.4
 
 - Fix a bug that occurs when a windows workspace can't be determined
diff --git a/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js b/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js
index eac10068..9c367a0c 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js
+++ b/DesktopCube@yare/files/DesktopCube@yare/5.4/extension.js
@@ -111,8 +111,8 @@ Cube.prototype = {
 
         Main.uiGroup.add_child(this.actor);
 
-        this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
-        this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
+        this.releaseID = this.actor.connect('key-release-event', Lang.bind(this, this._keyReleaseEvent));
+        this.pressID = this.actor.connect('key-press-event', Lang.bind(this, this._keyPressEvent));
 
         this.initBackground();
         this.dimBackground();
@@ -326,7 +326,8 @@ Cube.prototype = {
         let windows = global.get_window_actors();
         for (let i = 0; i < windows.length; i++) {
             let meta_window = windows[i].get_meta_window();
-            if (meta_window && meta_window.get_workspace().index() === workspaceIndex
+            if (meta_window && meta_window.get_workspace()
+                && (meta_window.get_workspace().index() === workspaceIndex || meta_window.is_on_all_workspaces())
                 && !meta_window.minimized
                 && meta_window.get_window_type() !== Meta.WindowType.DESKTOP) {
                 workspaceWindows.push(meta_window);
@@ -811,6 +812,8 @@ Cube.prototype = {
     },
 
     destroy: function() {
+        this.actor.disconnect(this.releaseID);
+        this.actor.disconnect(this.pressID);
         this._backgroundGroup.remove_child(this.metaBackgroundActor);
         Main.uiGroup.remove_child(this._backgroundGroup);
         Main.uiGroup.remove_child(this.actor);
diff --git a/DesktopCube@yare/files/DesktopCube@yare/metadata.json b/DesktopCube@yare/files/DesktopCube@yare/metadata.json
index 6a3b5611..d25720cd 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/metadata.json
+++ b/DesktopCube@yare/files/DesktopCube@yare/metadata.json
@@ -16,7 +16,7 @@
     "4.6",
     "5.4"
   ],
-  "version": "2.0.4",
+  "version": "2.0.5",
   "uuid": "DesktopCube@yare",
   "name": "Desktop Cube",
   "description": "Compiz Cube-like animation for workspace switching",
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/DesktopCube@yare.pot b/DesktopCube@yare/files/DesktopCube@yare/po/DesktopCube@yare.pot
index aec0167e..8f4d24cd 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/DesktopCube@yare.pot
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/DesktopCube@yare.pot
@@ -5,10 +5,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: DesktopCube@yare 2.0.4\n"
+"Project-Id-Version: DesktopCube@yare 2.0.5\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/ca.po b/DesktopCube@yare/files/DesktopCube@yare/po/ca.po
index 19df7c28..3417cd4b 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/ca.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/ca.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-08-25 22:27+0200\n"
 "Last-Translator: \n"
 "Language-Team: Odyssey <odysseyhyd@gmail.com>\n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/da.po b/DesktopCube@yare/files/DesktopCube@yare/po/da.po
index 89605eed..e9f85f3b 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/da.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2022-08-07 15:06+0200\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/de.po b/DesktopCube@yare/files/DesktopCube@yare/po/de.po
index a5a02c27..464f029a 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/de.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/de.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2021-03-02 22:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/es.po b/DesktopCube@yare/files/DesktopCube@yare/po/es.po
index 7b23859f..d173aa4e 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/es.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-12-21 20:03+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/eu.po b/DesktopCube@yare/files/DesktopCube@yare/po/eu.po
index fd6b3045..db7e3a52 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/eu.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/eu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-05-30 10:18+0200\n"
 "Last-Translator: Muxutruk <muxutruk2@users.noreply.github.com>\n"
 "Language-Team: Basque <muxutruk2@users.noreply.github.com>\n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/fi.po b/DesktopCube@yare/files/DesktopCube@yare/po/fi.po
index 6bd962cd..aa16da91 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/fi.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/fi.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: DesktopCube@yare 1.1.0\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/fr.po b/DesktopCube@yare/files/DesktopCube@yare/po/fr.po
index 0fcd5d49..afc18dda 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/fr.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/fr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-12-22 01:10+0100\n"
 "Last-Translator: Claudiux <claude.clerc@gmail.com>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/hr.po b/DesktopCube@yare/files/DesktopCube@yare/po/hr.po
index d00c8bca..069dd8b3 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/hr.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/hr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DesktopCube@yare\n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2017-04-30 16:57+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/hu.po b/DesktopCube@yare/files/DesktopCube@yare/po/hu.po
index ad1ef516..78f28977 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/hu.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/hu.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-11-25 13:45+0100\n"
 "Last-Translator: Kálmán „KAMI” Szalai <kami911@gmail.com>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/it.po b/DesktopCube@yare/files/DesktopCube@yare/po/it.po
index b9ac87a8..f59ff75a 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/it.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/it.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2022-06-03 10:52+0200\n"
 "Last-Translator: Dragone2 <dragone2@risposteinformatiche.it>\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/nl.po b/DesktopCube@yare/files/DesktopCube@yare/po/nl.po
index a2bfb258..55499719 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/nl.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/nl.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2024-11-27 11:29+0100\n"
 "Last-Translator: qadzek\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/pt_BR.po b/DesktopCube@yare/files/DesktopCube@yare/po/pt_BR.po
index 8e5c7c6b..18c68ba5 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/pt_BR.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/pt_BR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2021-09-26 21:23-0300\n"
 "Last-Translator: Marcelo Aof\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/ro.po b/DesktopCube@yare/files/DesktopCube@yare/po/ro.po
index 992093c3..f3bfd8b0 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/ro.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/ro.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2022-08-06 01:55+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/ru.po b/DesktopCube@yare/files/DesktopCube@yare/po/ru.po
index e903f89c..a1b031c8 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/ru.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/ru.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2023-12-03 14:51-0500\n"
 "Last-Translator: blogdron\n"
 "Language-Team: \n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/tr.po b/DesktopCube@yare/files/DesktopCube@yare/po/tr.po
index cf4b053f..c1161c88 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/tr.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/tr.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: 2017-09-01 18:36+0300\n"
 "Last-Translator: Gökhan Gökkaya <gokhanlnx@gmail.com>\n"
 "Language-Team: Linux Mint Türkiye\n"
diff --git a/DesktopCube@yare/files/DesktopCube@yare/po/zh_CN.po b/DesktopCube@yare/files/DesktopCube@yare/po/zh_CN.po
index ec575ef9..b3de58c4 100644
--- a/DesktopCube@yare/files/DesktopCube@yare/po/zh_CN.po
+++ b/DesktopCube@yare/files/DesktopCube@yare/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-"
 "extensions/issues\n"
-"POT-Creation-Date: 2025-01-09 09:51-0500\n"
+"POT-Creation-Date: 2025-01-09 21:14-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"