diff --git a/QodeAssistClient.cpp b/QodeAssistClient.cpp
index cfaf367..3a46793 100644
--- a/QodeAssistClient.cpp
+++ b/QodeAssistClient.cpp
@@ -145,7 +145,7 @@ void QodeAssistClient::scheduleRequest(TextEditor::TextEditorWidget *editor)
     }
 
     it.value()->setProperty("cursorPosition", editor->textCursor().position());
-    it.value()->start(settings().startSuggestionTimer());
+    it.value()->start(Settings::generalSettings().startSuggestionTimer());
 }
 
 void QodeAssistClient::handleCompletions(const GetCompletionRequest::Response &response,
diff --git a/QodeAssistSettings.cpp b/QodeAssistSettings.cpp
index f6938ca..ac98392 100644
--- a/QodeAssistSettings.cpp
+++ b/QodeAssistSettings.cpp
@@ -45,11 +45,6 @@ QodeAssistSettings::QodeAssistSettings()
 {
     setAutoApply(false);
 
-    startSuggestionTimer.setSettingsKey(Constants::START_SUGGESTION_TIMER);
-    startSuggestionTimer.setLabelText(Tr::tr("Start Suggestion Timer:"));
-    startSuggestionTimer.setRange(10, 10000);
-    startSuggestionTimer.setDefaultValue(500);
-
     resetToDefaults.m_buttonText = Tr::tr("Reset to Defaults");
 
     customJsonTemplate.setSettingsKey(Constants::CUSTOM_JSON_TEMPLATE);
@@ -171,7 +166,7 @@ void QodeAssistSettings::resetSettingsToDefaults()
         // resetAspect(presencePenalty);
         // resetAspect(useFrequencyPenalty);
         // resetAspect(frequencyPenalty);
-        resetAspect(startSuggestionTimer);
+        // resetAspect(startSuggestionTimer);
         // resetAspect(enableLogging);
         // resetAspect(ollamaLivetime);
         // resetAspect(specificInstractions);
diff --git a/QodeAssistSettings.hpp b/QodeAssistSettings.hpp
index 2323443..eb7032c 100644
--- a/QodeAssistSettings.hpp
+++ b/QodeAssistSettings.hpp
@@ -57,8 +57,6 @@ class QodeAssistSettings : public Utils::AspectContainer
 public:
     QodeAssistSettings();
 
-    Utils::IntegerAspect startSuggestionTimer{this};
-
     Utils::StringAspect customJsonTemplate{this};
     ButtonAspect saveCustomTemplateButton{this};
     ButtonAspect loadCustomTemplateButton{this};
diff --git a/settings/GeneralSettings.cpp b/settings/GeneralSettings.cpp
index c701d1b..6b7167a 100644
--- a/settings/GeneralSettings.cpp
+++ b/settings/GeneralSettings.cpp
@@ -61,6 +61,11 @@ GeneralSettings::GeneralSettings()
     multiLineCompletion.setDefaultValue(true);
     multiLineCompletion.setLabelText(Tr::tr("Enable Multiline Completion"));
 
+    startSuggestionTimer.setSettingsKey(Constants::START_SUGGESTION_TIMER);
+    startSuggestionTimer.setLabelText(Tr::tr("Start Suggestion Timer:"));
+    startSuggestionTimer.setRange(10, 10000);
+    startSuggestionTimer.setDefaultValue(500);
+
     llmProviders.setSettingsKey(Constants::LLM_PROVIDERS);
     llmProviders.setDisplayName(Tr::tr("LLM Providers:"));
     llmProviders.setDisplayStyle(Utils::SelectionAspect::DisplayStyle::ComboBox);
@@ -115,6 +120,7 @@ GeneralSettings::GeneralSettings()
 
         auto rootLayout = Column{Row{enableQodeAssist, Stretch{1}, resetToDefaults},
                                  enableAutoComplete,
+                                 startSuggestionTimer,
                                  multiLineCompletion,
                                  Space{8},
                                  enableLogging,
@@ -201,6 +207,7 @@ void GeneralSettings::resetPageToDefaults()
         resetAspect(modelName);
         resetAspect(fimPrompts);
         resetAspect(enableLogging);
+        resetAspect(startSuggestionTimer);
     }
 
     fimPrompts.setStringValue("StarCoder2");
diff --git a/settings/GeneralSettings.hpp b/settings/GeneralSettings.hpp
index 3b57d4a..4014a74 100644
--- a/settings/GeneralSettings.hpp
+++ b/settings/GeneralSettings.hpp
@@ -34,6 +34,7 @@ public:
     Utils::BoolAspect enableAutoComplete{this};
     Utils::BoolAspect multiLineCompletion{this};
     Utils::BoolAspect enableLogging{this};
+    Utils::IntegerAspect startSuggestionTimer{this};
 
     Utils::SelectionAspect llmProviders{this};
     Utils::StringAspect url{this};