diff --git a/python/helpers/pycharm/django_manage.py b/python/helpers/pycharm/django_manage.py
index 811701e6330c..bdc2571ceb30 100644
--- a/python/helpers/pycharm/django_manage.py
+++ b/python/helpers/pycharm/django_manage.py
@@ -11,7 +11,10 @@ try:
 except ImportError:
   from runpy_compat import run_module
 
-manage_file = 'manage'
+manage_file = os.getenv('PYCHARM_DJANGO_MANAGE_MODULE')
+if not manage_file:
+  manage_file = 'manage'
+
 
 if __name__ == "__main__":
     fixGetpass()
diff --git a/python/helpers/pycharm/django_manage_shell.py b/python/helpers/pycharm/django_manage_shell.py
index 0afd54a9dfcf..b83708e1b619 100644
--- a/python/helpers/pycharm/django_manage_shell.py
+++ b/python/helpers/pycharm/django_manage_shell.py
@@ -10,10 +10,11 @@ except ImportError:
   from runpy_compat import run_module
 
 
-def run():
+def run(working_dir):
+  sys.path.insert(0, working_dir)
   manage_file = os.getenv('PYCHARM_DJANGO_MANAGE_MODULE')
   if not manage_file:
-      manage_file = 'manage'
+    manage_file = 'manage'
 
   def execute_manager(settings_mod, argv = None):
       management.setup_environ(settings_mod)
diff --git a/python/helpers/pycharm/django_test_manage.py b/python/helpers/pycharm/django_test_manage.py
index 1783b74531f8..0b1ecb3e1950 100644
--- a/python/helpers/pycharm/django_test_manage.py
+++ b/python/helpers/pycharm/django_test_manage.py
@@ -8,7 +8,10 @@ base_path = sys.argv.pop()
 sys.path.insert(0, base_path)
 os.chdir(base_path)
 
-manage_file = 'manage'
+manage_file = os.getenv('PYCHARM_DJANGO_MANAGE_MODULE')
+if not manage_file:
+  manage_file = 'manage'
+
 try:
   __import__(manage_file)
 except ImportError: