diff --git a/awesome/rc.lua b/awesome/rc.lua
index 7a60178..ae23b18 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -28,8 +28,8 @@ local run_on_start_up = {
      "numlockx on",
      "nm-applet",
      "xcape -e \"Super_L=Super_L|XF86Launch5\" -t 5000",
-     os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh",
-     "xmodmap /home/user/.Xmodmap"
+     "xmodmap /home/user/.Xmodmap",
+     os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh"
 }
 
 -- ===================================================================
@@ -137,9 +137,9 @@ require("awesomewm-vim-tmux-navigator") {
 client.connect_signal("property::maximized", function(focused)
      local hide = focused.maximized or focused.fullscreen
      for i, c in ipairs(client.get()) do
-          if not c.floating and c.screen == focused.screen then
-                c.minimized = hide
-          end
+         if not c.floating and c.screen == focused.screen and c.first_tag == focused.first_tag then
+             c.minimized = hide
+         end
      end
 
      focused.minimized = false