diff --git a/cmd_click.c b/cmd_click.c
index fae0aaa..7f5c091 100644
--- a/cmd_click.c
+++ b/cmd_click.c
@@ -6,6 +6,7 @@ int cmd_click(context_t *context) {
   char *cmd = context->argv[0];
   int ret = 0;
   int clear_modifiers = 0;
+  int after_keys = 0;
   charcodemap_t *active_mods = NULL;
   int active_mods_n;
   char *window_arg = NULL;
@@ -14,11 +15,12 @@ int cmd_click(context_t *context) {
 
   int c;
   enum { 
-    opt_unused, opt_help, opt_clearmodifiers, opt_window, opt_delay,
+    opt_unused, opt_help, opt_clearmodifiers, opt_afterkeys, opt_window, opt_delay,
     opt_repeat
   };
   static struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, opt_clearmodifiers },
+    { "afterkeys", no_argument, NULL, opt_afterkeys },
     { "help", no_argument, NULL, opt_help },
     { "window", required_argument, NULL, opt_window },
     { "delay", required_argument, NULL, opt_delay },
@@ -27,7 +29,8 @@ int cmd_click(context_t *context) {
   };
   static const char *usage = 
             "Usage: %s [options] <button>\n"
-            "--clearmodifiers       - reset active modifiers (alt, etc) while typing\n"
+            "--clearmodifiers       - reset active modifiers (alt, etc) while moving\n"
+            "--afterkeys            - wait for all keys to be released before typing\n"
             "--window WINDOW        - specify a window to send click to\n"
             "--repeat REPEATS       - number of times to click. Default is 1\n"
             "--delay MILLISECONDS   - delay in milliseconds between clicks.\n"
@@ -38,7 +41,7 @@ int cmd_click(context_t *context) {
             "right = 3, wheel up = 4, wheel down = 5\n";
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+cw:h",
+  while ((c = getopt_long_only(context->argc, context->argv, "+caw:h",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'h':
@@ -51,6 +54,10 @@ int cmd_click(context_t *context) {
       case opt_clearmodifiers:
         clear_modifiers = 1;
         break;
+      case 'a':
+      case opt_afterkeys:
+        after_keys = 1;
+        break;
       case 'w':
       case opt_window:
         clear_modifiers = 1;
@@ -86,6 +93,9 @@ int cmd_click(context_t *context) {
   button = atoi(context->argv[0]);
 
   window_each(context, window_arg, {
+    if (after_keys) {
+      xdo_wait_for_key_release(context->xdo);
+    }
     if (clear_modifiers) {
       xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
       xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
diff --git a/cmd_key.c b/cmd_key.c
index 9ea7112..968d630 100644
--- a/cmd_key.c
+++ b/cmd_key.c
@@ -22,9 +22,11 @@ int cmd_key(context_t *context) {
 
   /* Options */
   int clear_modifiers = 0;
+  int after_keys = 0;
 
   static struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, 'c' },
+    { "afterkeys", no_argument, NULL, 'a' },
     { "delay", required_argument, NULL, 'd' },
     { "repeat-delay", required_argument, NULL, 'R' },
     { "help", no_argument, NULL, 'h' },
@@ -36,6 +38,7 @@ int cmd_key(context_t *context) {
   static const char *usage = 
      "Usage: %s [options] <keysequence> [keysequence ...]\n"
      "--clearmodifiers     - clear active keyboard modifiers during keystrokes\n"
+     "--afterkeys          - wait for all keys to be released before typing\n"
      "--delay DELAY        - Use DELAY milliseconds between keystrokes\n"
      "--repeat TIMES       - How many times to repeat the key sequence\n"
      "--repeat-delay DELAY - DELAY milliseconds between repetitions\n"
@@ -51,7 +54,7 @@ int cmd_key(context_t *context) {
 
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+d:hcw:",
+  while ((c = getopt_long_only(context->argc, context->argv, "+d:hcaw:",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'w':
@@ -61,6 +64,9 @@ int cmd_key(context_t *context) {
       case 'c':
         clear_modifiers = 1;
         break;
+      case 'a':
+	after_keys = 1;
+	break;
       case 'h':
         printf(usage, cmd);
         consume_args(context, context->argc);
@@ -115,6 +121,9 @@ int cmd_key(context_t *context) {
 
   int max_arg = context->argc;
   window_each(context, window_arg, {
+    if (after_keys) {
+      xdo_wait_for_key_release(context->xdo);
+    }
     if (clear_modifiers) {
       xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
       xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
diff --git a/cmd_mousedown.c b/cmd_mousedown.c
index 88cd087..50c7a4a 100644
--- a/cmd_mousedown.c
+++ b/cmd_mousedown.c
@@ -8,11 +8,13 @@ int cmd_mousedown(context_t *context) {
   charcodemap_t *active_mods = NULL;
   int active_mods_n;
   int clear_modifiers = 0;
+  int after_keys = 0;
   char *window_arg = NULL;
 
   int c;
   static struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, 'c' },
+    { "afterkeys", no_argument, NULL, 'a' },
     { "help", no_argument, NULL, 'h' },
     { "window", required_argument, NULL, 'w' },
     { 0, 0, 0, 0 },
@@ -20,15 +22,20 @@ int cmd_mousedown(context_t *context) {
   static const char *usage =
             "Usage: %s [--clearmodifiers] [--window WINDOW] <button>\n"
             "--window <windowid>    - specify a window to send keys to\n"
-            "--clearmodifiers       - reset active modifiers (alt, etc) while typing\n";
+            "--clearmodifiers       - reset active modifiers (alt, etc) while clicking\n"
+            "--afterkeys            - wait for all keys to be released before clicking\n";
+
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+chw:",
+  while ((c = getopt_long_only(context->argc, context->argv, "+cahw:",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'c':
         clear_modifiers = 1;
         break;
+      case 'a':
+        after_keys = 1;
+        break;
       case 'h':
         printf(usage, cmd);
         consume_args(context, context->argc);
@@ -54,6 +61,9 @@ int cmd_mousedown(context_t *context) {
   button = atoi(context->argv[0]);
 
   window_each(context, window_arg, {
+    if (after_keys) {
+      xdo_wait_for_key_release(context->xdo);
+    }
     if (clear_modifiers) {
       xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
       xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
diff --git a/cmd_mousemove.c b/cmd_mousemove.c
index 4c0c952..99e982d 100644
--- a/cmd_mousemove.c
+++ b/cmd_mousemove.c
@@ -5,6 +5,7 @@
 struct mousemove {
   Window window;
   int clear_modifiers;
+  int after_keys;
   int opsync;
   int polar_coordinates;
   int x;
@@ -32,11 +33,12 @@ int cmd_mousemove(context_t *context) {
 
   int c;
   enum {
-    opt_unused, opt_help, opt_sync, opt_clearmodifiers, opt_polar,
+    opt_unused, opt_help, opt_sync, opt_clearmodifiers, opt_afterkeys, opt_polar,
     opt_screen, opt_step, opt_delay, opt_window
   };
   static struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, opt_clearmodifiers },
+    { "afterkeys", no_argument, NULL, opt_afterkeys },
     { "help", no_argument, NULL, opt_help},
     { "polar", no_argument, NULL, opt_polar },
     { "screen", required_argument, NULL, opt_screen },
@@ -48,7 +50,9 @@ int cmd_mousemove(context_t *context) {
   };
   static const char *usage = 
       "Usage: %s [options] <x> <y>\n"
-      "-c, --clearmodifiers      - reset active modifiers (alt, etc) while typing\n"
+      "-c, --clearmodifiers      - reset active modifiers (alt, etc) while moving\n"
+      "-a, --afterkeys           - wait for all keys to be released before moving\n"
+
       //"-d, --delay <MS>          - sleeptime in milliseconds between steps.\n"
       //"--step <STEP>             - pixels to move each time along path to x,y.\n" "-p, --polar               - Use polar coordinates. X as an angle, Y as distance\n"
       "--screen SCREEN           - which screen to move on, default is current screen\n"
@@ -56,13 +60,17 @@ int cmd_mousemove(context_t *context) {
       "-w, --window <windowid>   - specify a window to move relative to.\n";
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+chw:pd:",
+  while ((c = getopt_long_only(context->argc, context->argv, "+cahw:pd:",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'c':
       case opt_clearmodifiers:
         mousemove.clear_modifiers = 1;
         break;
+      case 'a':
+      case opt_afterkeys:
+        mousemove.after_keys = 1;
+        break;
       case 'h':
       case opt_help:
         printf(usage, cmd);
@@ -187,6 +195,9 @@ static int _mousemove(context_t *context, struct mousemove *mousemove) {
   int mx, my, mscreen;
   xdo_get_mouse_location(context->xdo, &mx, &my, &mscreen);
 
+  if (mousemove->after_keys) {
+    xdo_wait_for_key_release(context->xdo);
+  }
 
   if (mousemove->clear_modifiers) {
     xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
diff --git a/cmd_mousemove_relative.c b/cmd_mousemove_relative.c
index db02c48..050496c 100644
--- a/cmd_mousemove_relative.c
+++ b/cmd_mousemove_relative.c
@@ -7,6 +7,7 @@ int cmd_mousemove_relative(context_t *context) {
   char *cmd = *context->argv;
   int polar_coordinates = 0;
   int clear_modifiers = 0;
+  int after_keys = 0;
   int opsync = 0;
   int origin_x = -1, origin_y = -1;
 
@@ -14,18 +15,20 @@ int cmd_mousemove_relative(context_t *context) {
   int active_mods_n;
   int c;
   enum {
-    opt_unused, opt_help, opt_sync, opt_clearmodifiers, opt_polar
+    opt_unused, opt_help, opt_sync, opt_clearmodifiers, opt_afterkeys, opt_polar
   };
   static struct option longopts[] = {
     { "help", no_argument, NULL, opt_help },
     { "sync", no_argument, NULL, opt_sync },
     { "polar", no_argument, NULL, opt_polar },
     { "clearmodifiers", no_argument, NULL, opt_clearmodifiers },
+    { "afterkeys", no_argument, NULL, opt_afterkeys },
     { 0, 0, 0, 0 },
   };
   static const char *usage =
       "Usage: %s [options] <x> <y>\n"
-      "-c, --clearmodifiers      - reset active modifiers (alt, etc) while typing\n"
+      "-c, --clearmodifiers      - reset active modifiers (alt, etc) while moving\n"
+      "-a, --afterkeys           - wait for all keys to be released before moving\n"
       "-p, --polar               - Use polar coordinates. X as an angle, Y as distance\n"
       "--sync                    - only exit once the mouse has moved\n"
       "\n"
@@ -39,7 +42,7 @@ int cmd_mousemove_relative(context_t *context) {
       "   %s 100 140\n";
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+cph",
+  while ((c = getopt_long_only(context->argc, context->argv, "+cpah",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'h':
@@ -59,6 +62,10 @@ int cmd_mousemove_relative(context_t *context) {
       case opt_clearmodifiers:
         clear_modifiers = 1;
         break;
+      case 'a':
+      case opt_afterkeys:
+        clear_modifiers = 1;
+        break;
       default:
         fprintf(stderr, usage, cmd, cmd, cmd);
         return EXIT_FAILURE;
@@ -95,6 +102,9 @@ int cmd_mousemove_relative(context_t *context) {
     y = (-sin(radians) * distance);
   }
  
+  if (after_keys) {
+    xdo_wait_for_key_release(context->xdo);
+  }
   if (clear_modifiers) {
     xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
     xdo_clear_active_modifiers(context->xdo, CURRENTWINDOW, active_mods, active_mods_n);
diff --git a/cmd_mouseup.c b/cmd_mouseup.c
index fcb37a0..1a051d5 100644
--- a/cmd_mouseup.c
+++ b/cmd_mouseup.c
@@ -9,10 +9,12 @@ int cmd_mouseup(context_t *context) {
   charcodemap_t *active_mods = NULL;
   int active_mods_n;
   int clear_modifiers = 0;
+  int after_keys = 0;
 
   int c;
   static struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, 'c' },
+    { "afterkeys", no_argument, NULL, 'a' },
     { "help", no_argument, NULL, 'h' },
     { "window", required_argument, NULL, 'w' },
     { 0, 0, 0, 0 },
@@ -20,10 +22,11 @@ int cmd_mouseup(context_t *context) {
   static const char *usage =
             "Usage: %s [--clearmodifiers] [--window WINDOW] <button>\n"
             "--window <windowid>    - specify a window to send keys to\n"
-            "--clearmodifiers       - reset active modifiers (alt, etc) while typing\n";
+            "--clearmodifiers       - reset active modifiers (alt, etc) while clicking\n"
+            "--afterkeys            - wait for all keys to be released before clicking\n";
   int option_index;
 
-  while ((c = getopt_long_only(context->argc, context->argv, "+cw:h",
+  while ((c = getopt_long_only(context->argc, context->argv, "+caw:h",
                                longopts, &option_index)) != -1) {
     switch (c) {
       case 'h':
@@ -34,6 +37,9 @@ int cmd_mouseup(context_t *context) {
       case 'c':
         clear_modifiers = 1;
         break;
+      case 'a':
+        after_keys = 1;
+        break;
       case 'w':
         window_arg = strdup(optarg);
         break;
@@ -54,6 +60,9 @@ int cmd_mouseup(context_t *context) {
   button = atoi(context->argv[0]);
 
   window_each(context, window_arg, {
+    if (after_keys) {
+      xdo_wait_for_key_release(context->xdo);
+    }
     if (clear_modifiers) {
       xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
       xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
diff --git a/cmd_type.c b/cmd_type.c
index 0fa8213..ef36692 100644
--- a/cmd_type.c
+++ b/cmd_type.c
@@ -26,15 +26,17 @@ int cmd_type(context_t *context) {
 
   /* Options */
   int clear_modifiers = 0;
+  int after_keys = 0;
   useconds_t delay = 12000; /* 12ms between keystrokes default */
 
   enum {
-    opt_unused, opt_clearmodifiers, opt_delay, opt_help, opt_window, opt_args,
-    opt_terminator, opt_file
+    opt_unused, opt_clearmodifiers, opt_afterkeys, opt_delay, opt_help,
+    opt_window, opt_args, opt_terminator, opt_file
   };
 
   struct option longopts[] = {
     { "clearmodifiers", no_argument, NULL, opt_clearmodifiers },
+    { "afterkeys", no_argument, NULL, opt_afterkeys },
     { "delay", required_argument, NULL, opt_delay },
     { "help", no_argument, NULL, opt_help },
     { "window", required_argument, NULL, opt_window },
@@ -50,6 +52,7 @@ int cmd_type(context_t *context) {
     "--window <windowid>    - specify a window to send keys to\n"
     "--delay <milliseconds> - delay between keystrokes\n"
     "--clearmodifiers       - reset active modifiers (alt, etc) while typing\n"
+    "--afterkeys            - wait for all keys to be released before typing\n"
     "--args N  - how many arguments to expect in the exec command. This is\n"
     "            useful for ending an exec and continuing with more xdotool\n"
     "            commands\n"
@@ -76,6 +79,9 @@ int cmd_type(context_t *context) {
       case opt_clearmodifiers:
         clear_modifiers = 1;
         break;
+      case opt_afterkeys:
+        after_keys = 1;
+        break;
       case opt_help:
         printf(usage, cmd);
         consume_args(context, context->argc);
@@ -180,6 +186,9 @@ int cmd_type(context_t *context) {
   }
 
   window_each(context, window_arg, {
+    if (after_keys) {
+      xdo_wait_for_key_release(context->xdo);
+    }
     if (clear_modifiers) {
       xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
       xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
diff --git a/xdo.c b/xdo.c
index 7651573..d551721 100644
--- a/xdo.c
+++ b/xdo.c
@@ -1672,6 +1672,23 @@ int xdo_get_active_modifiers(const xdo_t *xdo, charcodemap_t **keys,
   return XDO_SUCCESS;
 }
 
+void xdo_wait_for_key_release(const xdo_t *xdo) {
+  char keymap[32]; /* keycode map: 256 bits */
+  for (;;) {
+    XQueryKeymap(xdo->xdpy, keymap);
+    int any_key_down = 0;
+    for (size_t i = 0; i < sizeof(keymap); i++) {
+      if (keymap[i]) {
+        any_key_down = 1;
+        break;
+      }        
+    }
+    if (!any_key_down)
+      return;          
+    usleep(30000);
+  }
+}
+
 unsigned int xdo_get_input_state(const xdo_t *xdo) {
   Window root, dummy;
   int root_x, root_y, win_x, win_y;
diff --git a/xdo.h b/xdo.h
index 4ff42f9..117bb0d 100644
--- a/xdo.h
+++ b/xdo.h
@@ -806,6 +806,11 @@ const char **xdo_get_symbol_map(void);
 int xdo_get_active_modifiers(const xdo_t *xdo, charcodemap_t **keys,
                              int *nkeys);
 
+/**
+ * Wait for any currently pressed modifier keys to be released.
+ */
+void xdo_wait_for_key_release(const xdo_t *xdo);
+
 /**
  * Send any events necessary to clear the active modifiers.
  * For example, if you are holding 'alt' when xdo_get_active_modifiers is 
diff --git a/xdotool.pod b/xdotool.pod
index f344eed..7864bb7 100644
--- a/xdotool.pod
+++ b/xdotool.pod
@@ -43,6 +43,11 @@ See also: L<SENDEVENT NOTES> and L<WINDOW STACK>
 
 Clear modifiers before sending keystrokes. See L<CLEARMODIFIERS> below.
 
+=item B<--afterkeys>
+
+Wait for the user to release all keys before sending keystrokes.
+See L<AFTERKEYS> below.
+
 =item B<--delay milliseconds>
 
 Delay between keystrokes. Default is 12ms.
@@ -105,6 +110,11 @@ Delay between keystrokes. Default is 12ms.
 
 Clear modifiers before sending keystrokes. See L<CLEARMODIFIERS> below.
 
+=item B<--afterkeys>
+
+Wait for the user to release all keys before sending keystrokes.
+See L<AFTERKEYS> below.
+
 =back
 
 Types as if you had typed it. Supports newlines and tabs (ASCII newline and
@@ -168,6 +178,10 @@ The origin defaults to the center of the current screen. If you specify a
 
 See L<CLEARMODIFIERS>
 
+=item B<--afterkeys>
+
+See L<AFTERKEYS>
+
 =item B<--sync>
 
 After sending the mouse move request, wait until the mouse is actually
@@ -210,6 +224,10 @@ in the general case than waiting for a specific target.
 
 See L<CLEARMODIFIERS>
 
+=item B<--afterkeys>
+
+See L<AFTERKEYS>
+
 =back
 
 =item B<click> I<[options]> I<button>
@@ -226,6 +244,10 @@ wheel up is 4, wheel down is 5.
 
 Clear modifiers before clicking. See L<CLEARMODIFIERS> below.
 
+=item B<--afterkeys>
+
+Wait for keys to be released before clicking. See L<AFTERKEYS> below.
+
 =item B<--repeat> REPEAT
 
 Specify how many times to click. Default is 1. For a double-click, use
@@ -1037,7 +1059,7 @@ The order of operations if you hold shift while running 'xdotool key --clearmodi
 
 =back
 
-The I<--clearmodifiers> flag can currently clear of the following:
+The I<--clearmodifiers> flag can currently clear the following:
 
 =over
 
@@ -1051,6 +1073,17 @@ The I<--clearmodifiers> flag can currently clear of the following:
 
 =back
 
+=head1 AFTERKEYS
+
+Any command taking the I<--afterkeys> flag will wait until any currently
+pressed keys have been released before performing the action, to avoid the
+end of a user's keyboard shortcut interfering with the beginning of xdotool's
+actions.
+
+I<--afterkeys> only waits for key presses, not mouse buttons or caps lock state.
+If you use both I<--afterkeys> and I<--clearmodifiers>, I<--afterkeys> happens
+first, then the mouse buttons and caps lock state will be cleared as described above.
+
 =head1 SENDEVENT NOTES
 
 If you are trying to send key input to a specific window, and it does not