diff --git a/python/helpers/pydev/pydev_monkey.py b/python/helpers/pydev/pydev_monkey.py
index 5f1f4cef5d68..191d01f47cd9 100644
--- a/python/helpers/pydev/pydev_monkey.py
+++ b/python/helpers/pydev/pydev_monkey.py
@@ -114,17 +114,21 @@ def patch_args(args):
             return args
 
         i = 1
+        original = sys.original_argv[:]
         while i < len(args):
-            if args[i].startswith('-'):
-                new_args.append(args[i])
+            if args[i] == '-m':
+                original.insert(i, '--module')
             else:
-                break
+                if args[i].startswith('-'):
+                    new_args.append(args[i])
+                else:
+                    break
             i += 1
 
         if i < len(args) and _is_managed_arg(args[i]):  # no need to add pydevd twice
             return args
 
-        for x in sys.original_argv:
+        for x in original:
             if sys.platform == "win32" and not x.endswith('"'):
                 arg = '"%s"' % x
             else: