diff --git a/README.md b/README.md
index 198be13..14c13e9 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ Refer to [https://dwm.suckless.org/](https://dwm.suckless.org/) for details on t
 
 ### Changelog:
 
+2020-04-23 - Improved swallow and switchtag compatibility
+
 2020-04-16 - Upgraded the scratchpad patch to the multiple scratchpads patch \[[ref](https://lists.suckless.org/hackers/2004/17205.html)\]. Updated the statuscolors patch with the width computation fix \[[ref](https://lists.suckless.org/hackers/2004/17207.html)\].
 
 2020-04-13 - Added statuscmd patch
diff --git a/dwm.c b/dwm.c
index 5bae9f7..b982a3f 100644
--- a/dwm.c
+++ b/dwm.c
@@ -547,7 +547,12 @@ applyrules(Client *c)
 				c->mon = m;
 
 			#if SWITCHTAG_PATCH
-			if (r->switchtag) {
+			#if SWALLOW_PATCH
+			if (r->switchtag && (c->noswallow || !termforwin(c)))
+			#else
+			if (r->switchtag)
+			#endif // SWALLOW_PATCH
+			{
 				unsigned int newtagset;
 				if (r->switchtag == 2)
 					newtagset = c->mon->tagset[c->mon->seltags] ^ c->tags;