1 files changed, 8 insertions, 1 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index a5265f9..78f3aa1 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -57,6 +57,13 @@ FluxboxWindow &WindowHelperBoolCmd::fbwindow() {
     return *FocusControl::focusedFbWindow();
 }
 
+WinClient &WindowHelperBoolCmd::winclient() {
+    // will exist from execute above
+    WinClient *tmp = WindowCmd<void>::client();
+    if (tmp) return *tmp;
+    return *FocusControl::focusedWindow();
+}
+
 void CurrentWindowCmd::real_execute() {
     (fbwindow().*m_action)();
 }
@@ -234,5 +241,5 @@ void SetAlphaCmd::real_execute() {
 }
 
 bool MatchCmd::real_execute() {
-    return m_pat.match(fbwindow());
+    return m_pat.match(winclient());
 }