diff --git a/src/main/kotlin/cc/unitmesh/devti/runconfig/DtRunConfiguration.kt b/src/main/kotlin/cc/unitmesh/devti/runconfig/DtRunConfiguration.kt
index e3097eec5d..f776102396 100644
--- a/src/main/kotlin/cc/unitmesh/devti/runconfig/DtRunConfiguration.kt
+++ b/src/main/kotlin/cc/unitmesh/devti/runconfig/DtRunConfiguration.kt
@@ -32,10 +32,11 @@ class DtRunConfiguration(project: Project, name: String, factory: ConfigurationF
         super.writeExternal(element)
 
         element.writeString("githubToken", options.githubToken())
+        element.writeString("githubRepo", options.githubRepo())
         element.writeString("openAiApiKey", options.openAiApiKey())
         element.writeString("aiEngineVersion", options.aiEngineVersion().toString())
         element.writeString("aiMaxTokens", options.aiMaxTokens().toString())
-        element.writeString("githubRepo", options.githubRepo())
+        element.writeString("storyId", options.storyId())
     }
 
     override fun readExternal(element: Element) {
@@ -46,6 +47,7 @@ class DtRunConfiguration(project: Project, name: String, factory: ConfigurationF
         element.readString("aiEngineVersion")?.let { this.options.setAiEngineVersion(it.toInt()) }
         element.readString("aiMaxTokens")?.let { this.options.setAiMaxTokens(it.toInt()) }
         element.readString("githubRepo")?.let { this.options.setGithubRepo(it) }
+        element.readString("storyId")?.let { this.options.setStoryId(it) }
     }
 
     fun setGithubToken(text: String) {
diff --git a/src/main/kotlin/cc/unitmesh/devti/runconfig/ui/DtSettingsEditor.kt b/src/main/kotlin/cc/unitmesh/devti/runconfig/ui/DtSettingsEditor.kt
index 26989f745a..678ce5994d 100644
--- a/src/main/kotlin/cc/unitmesh/devti/runconfig/ui/DtSettingsEditor.kt
+++ b/src/main/kotlin/cc/unitmesh/devti/runconfig/ui/DtSettingsEditor.kt
@@ -18,7 +18,7 @@ class DtSettingsEditor(project: Project) : SettingsEditor<DtRunConfiguration>()
 
     private var panel: JComponent? = null
 
-    private val githubInput = DtCommandLineEditor(project, completionProvider)
+    private val githubToken = DtCommandLineEditor(project, completionProvider)
     private val aiApiToken = DtCommandLineEditor(project, completionProvider)
     private val githubRepo = DtCommandLineEditor(project, completionProvider)
     private val storyId = DtCommandLineEditor(project, completionProvider)
@@ -34,7 +34,7 @@ class DtSettingsEditor(project: Project) : SettingsEditor<DtRunConfiguration>()
 
     override fun createEditor(): JComponent = panel {
         row("Github Token:") {
-            fullWidthCell(githubInput)
+            fullWidthCell(githubToken)
         }
 
         row ("GitHub Project (owner/repo)") {
@@ -66,7 +66,8 @@ class DtSettingsEditor(project: Project) : SettingsEditor<DtRunConfiguration>()
     }
 
     override fun resetEditorFrom(configuration: DtRunConfiguration) {
-        githubInput.text = configuration.options.githubToken()
+        githubToken.text = configuration.options.githubToken()
+        githubRepo.text = configuration.options.githubRepo()
         aiApiToken.text = configuration.options.openAiApiKey()
         aiEngineVersion.selectedIndex = configuration.options.aiEngineVersion()
         openAiMaxTokens = configuration.options.aiMaxTokens()
@@ -75,11 +76,11 @@ class DtSettingsEditor(project: Project) : SettingsEditor<DtRunConfiguration>()
     }
 
     override fun applyEditorTo(configuration: DtRunConfiguration) {
-        configuration.setGithubToken(githubInput.text)
+        configuration.setGithubToken(githubToken.text)
+        configuration.setGithubRepo(githubRepo.text)
         configuration.setOpenAiApiKey(aiApiToken.text)
         configuration.setAiVersion(DtOpenAIVersion.fromIndex(aiEngineVersion.selectedIndex))
         configuration.setAiMaxTokens(openAiMaxTokens)
-        configuration.setGithubRepo(githubRepo.text)
         configuration.setStoryId(storyId.text)
     }
 }