diff --git a/dwm.1 b/dwm.1
index 2758bbf..31ebad0 100644
--- a/dwm.1
+++ b/dwm.1
@@ -47,16 +47,22 @@ and
 .B floating
 mode.
 .TP
-.B Button2
-click on a tag label adds/removes that
-.B tag
-to/from the focused
-.B window.
-.TP
 .B Button3
 click on a tag label adds/removes all windows with that
 .B tag
 to/from the view.
+.TP
+.B Mod1-Button1
+click on a tag label applies that
+.B tag
+to the focused
+.BR window .
+.TP
+.B Mod1-Button3
+click on a tag label adds/removes that
+.B tag
+to/from the focused
+.BR window .
 .SS Keyboard commands
 .TP
 .B Mod1-Shift-Return
diff --git a/event.c b/event.c
index e97abad..a719bf2 100644
--- a/event.c
+++ b/event.c
@@ -111,13 +111,16 @@ buttonpress(XEvent *e)
 			if(ev->x < x) {
 				switch(ev->button) {
 				case Button1:
-					view(&a);
-					break;
-				case Button2:
-					toggletag(&a);
+					if(ev->state & MODKEY)
+						tag(&a);
+					else
+						view(&a);
 					break;
 				case Button3:
-					toggleview(&a);
+					if(ev->state & MODKEY)
+						toggletag(&a);
+					else
+						toggleview(&a);
 					break;
 				}
 				return;