diff --git a/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java b/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java
index 2a969d67d5f7..9fcd9c49c149 100644
--- a/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java
+++ b/python/src/com/jetbrains/python/packaging/setupPy/CreateSetupPyAction.java
@@ -1,6 +1,7 @@
 package com.jetbrains.python.packaging.setupPy;
 
 import com.intellij.ide.IdeView;
+import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.fileTemplates.actions.AttributesDefaults;
 import com.intellij.ide.fileTemplates.actions.CreateFromTemplateAction;
@@ -40,6 +41,12 @@ public class CreateSetupPyAction extends CreateFromTemplateAction {
     getTemplatePresentation().setText("Create setup.py");
   }
 
+  @Override
+  public FileTemplate getTemplate() {
+    // to ensure changes are picked up, reload the template on every call (PY-6681)
+    return FileTemplateManager.getInstance().getInternalTemplate("Setup Script");
+  }
+
   @Override
   public void update(AnActionEvent e) {
     final Module module = e.getData(LangDataKeys.MODULE);