diff --git a/rc.lua.template b/rc.lua.template
index faa8270..8b6d75a 100644
--- a/rc.lua.template
+++ b/rc.lua.template
@@ -144,7 +144,18 @@ awful.util.tasklist_buttons = my_table.join(
         if c == client.focus then
             c.minimized = true
         else
-            c:emit_signal("request::activate", "tasklist", {raise = true})
+            --c:emit_signal("request::activate", "tasklist", {raise = true})<Paste>
+
+            -- Without this, the following
+            -- :isvisible() makes no sense
+            c.minimized = false
+            if not c:isvisible() and c.first_tag then
+                c.first_tag:view_only()
+            end
+            -- This will also un-minimize
+            -- the client, if needed
+            client.focus = c
+            c:raise()
         end
     end),
     awful.button({ }, 3, function ()