diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
index 6bda5c9f2d..299dfa4126 100644
--- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
+++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
@@ -109,7 +109,7 @@ object UtTestsDialogProcessor {
             srcClasses,
             extractMembersFromSrcClasses,
             focusedMethods,
-            UtSettings.utBotGenerationTimeoutInMillis,
+            project.service<Settings>().generationTimeoutInMillis
         )
         if (model.getAllTestSourceRoots().isEmpty() && project.isBuildWithGradle) {
             val errorMessage = """
@@ -308,7 +308,7 @@ object UtTestsDialogProcessor {
                                     Messages.showInfoMessage(
                                         model.project,
                                         "No methods for test generation were found among selected items",
-                                        "No methods found"
+                                        "No Methods Found"
                                     )
                                 }
                                 return
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt
index 58b2e28428..a3500c1405 100644
--- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt
+++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/settings/Settings.kt
@@ -26,6 +26,7 @@ private fun fromGenerateTestsModel(model: GenerateTestsModel): Settings.State {
         fuzzingValue = model.fuzzingValue,
         runGeneratedTestsWithCoverage = model.runGeneratedTestsWithCoverage,
         commentStyle = model.commentStyle,
+        generationTimeoutInMillis = model.timeout,
         summariesGenerationType = model.summariesGenerationType
     )
 }
\ No newline at end of file
diff --git a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
index 0e67c14516..edb79c73f9 100644
--- a/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
+++ b/utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/GenerateTestsDialogWindow.kt
@@ -153,8 +153,6 @@ private const val RECENTS_KEY = "org.utbot.recents"
 private const val SAME_PACKAGE_LABEL = "same as for sources"
 
 private const val WILL_BE_INSTALLED_LABEL = " (will be installed)"
-private const val WILL_BE_CONFIGURED_LABEL = " (will be configured)"
-private const val MINIMUM_TIMEOUT_VALUE_IN_SECONDS = 1
 
 private const val ACTION_GENERATE = "Generate Tests"
 private const val ACTION_GENERATE_AND_RUN = "Generate and Run"
@@ -174,7 +172,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
         findTestPackageComboValue(),
         model.project,
         RECENTS_KEY,
-        "Choose destination package"
+        "Choose Destination Package"
     )
 
     private val testSourceFolderField = TestFolderComboWithBrowseButton(model)
@@ -184,12 +182,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
     private val mockStrategies = createComboBox(MockStrategyApi.values())
     private val staticsMocking = JCheckBox("Mock static methods")
     private val timeoutSpinner =
-        JBIntSpinner(
-            TimeUnit.MILLISECONDS.toSeconds(UtSettings.utBotGenerationTimeoutInMillis).toInt(),
-            MINIMUM_TIMEOUT_VALUE_IN_SECONDS,
-            Int.MAX_VALUE,
-            MINIMUM_TIMEOUT_VALUE_IN_SECONDS
-        ).also {
+        JBIntSpinner(TimeUnit.MILLISECONDS.toSeconds(model.timeout).toInt(), 1, Int.MAX_VALUE, 1).also {
             when(val editor = it.editor) {
                 is JSpinner.DefaultEditor -> {
                     when(val formatter = editor.textField.formatter) {
@@ -617,7 +610,7 @@ class GenerateTestsDialogWindow(val model: GenerateTestsModel) : DialogWrapper(m
     private fun showTestRootAbsenceErrorMessage() =
         Messages.showErrorDialog(
             "Test source root is not configured or is located out of content entry!",
-            "Generation error"
+            "Generation Error"
         )
 
     private fun getOrCreateTestRoot(testSourceRoot: VirtualFile): Boolean {
diff --git a/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/settings/CommonSettings.kt b/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/settings/CommonSettings.kt
index 4d369c94fc..e1a07f68a4 100644
--- a/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/settings/CommonSettings.kt
+++ b/utbot-ui-commons/src/main/kotlin/org/utbot/intellij/plugin/settings/CommonSettings.kt
@@ -64,6 +64,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
         var runGeneratedTestsWithCoverage: Boolean = false,
         var commentStyle: JavaDocCommentStyle = JavaDocCommentStyle.defaultItem,
         var summariesGenerationType: SummariesGenerationType = UtSettings.summaryGenerationType,
+        var generationTimeoutInMillis: Long = UtSettings.utBotGenerationTimeoutInMillis,
         var enableExperimentalLanguagesSupport: Boolean = false,
     ) {
 
@@ -90,6 +91,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
             if (runGeneratedTestsWithCoverage != other.runGeneratedTestsWithCoverage) return false
             if (commentStyle != other.commentStyle) return false
             if (summariesGenerationType != other.summariesGenerationType) return false
+            if (generationTimeoutInMillis != other.generationTimeoutInMillis) return false
 
             return true
         }
@@ -110,6 +112,7 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
             result = 31 * result + fuzzingValue.hashCode()
             result = 31 * result + if (runGeneratedTestsWithCoverage) 1 else 0
             result = 31 * result + summariesGenerationType.hashCode()
+            result = 31 * result + generationTimeoutInMillis.hashCode()
 
             return result
         }
@@ -132,6 +135,12 @@ class Settings(val project: Project) : PersistentStateComponent<Settings.State>
             state.hangingTestsTimeout = value
         }
 
+    var generationTimeoutInMillis : Long
+        get() = state.generationTimeoutInMillis
+        set(value) {
+            state.generationTimeoutInMillis = value
+        }
+
     val staticsMocking: StaticsMocking get() = state.staticsMocking
 
     val runInspectionAfterTestGeneration: Boolean get() = state.runInspectionAfterTestGeneration