diff --git a/dwm.c b/dwm.c
index 329b839..d665066 100644
--- a/dwm.c
+++ b/dwm.c
@@ -3277,6 +3277,10 @@ tag(const Arg *arg)
 
 	if (selmon->sel && arg->ui & TAGMASK) {
 		selmon->sel->tags = arg->ui & TAGMASK;
+		#if SWITCHTAG_PATCH
+		if (selmon->sel->switchtag)
+			selmon->sel->switchtag = 0;
+		#endif // SWITCHTAG_PATCH
 		focus(NULL);
 		#if SWAPFOCUS_PATCH && PERTAG_PATCH
 		selmon->pertag->prevclient[selmon->pertag->curtag] = NULL;
diff --git a/patch/combo.c b/patch/combo.c
index 7d1f3f2..907b645 100644
--- a/patch/combo.c
+++ b/patch/combo.c
@@ -12,6 +12,10 @@ void
 combotag(const Arg *arg)
 {
 	if (selmon->sel && arg->ui & TAGMASK) {
+		#if SWITCHTAG_PATCH
+		if (selmon->sel->switchtag)
+			selmon->sel->switchtag = 0;
+		#endif // SWITCHTAG_PATCH
 		if (combo) {
 			selmon->sel->tags |= arg->ui & TAGMASK;
 		} else {