diff --git a/frontend/src/pages/Settings.jsx b/frontend/src/pages/Settings.jsx
index 30ed8ed..2b1e5a6 100644
--- a/frontend/src/pages/Settings.jsx
+++ b/frontend/src/pages/Settings.jsx
@@ -148,6 +148,14 @@ function Settings() {
     setAlerts({ ...alerts, ollama: null });
 
     try {
+      // First save the settings if they are filled
+      if (settings.ollama_server_url && settings.ollama_model) {
+        await axios.put(`${API_URL}/api/ollama/settings`, {
+          ollama_server_url: settings.ollama_server_url,
+          ollama_model: settings.ollama_model,
+        }, { withCredentials: true });
+      }
+
       const response = await axios.get(
         `${API_URL}/api/ollama/test`,
         { withCredentials: true }
@@ -425,10 +433,20 @@ function Settings() {
             {ollamaModels.length > 0 && (
               <Alert severity="info" sx={{ mt: 2 }}>
                 <Typography variant="body2" fontWeight="bold">
-                  Mevcut Modeller:
+                  Mevcut Modeller (tıklayarak seçin):
                 </Typography>
                 {ollamaModels.map((model, idx) => (
-                  <Typography key={idx} variant="body2">
+                  <Typography 
+                    key={idx} 
+                    variant="body2"
+                    sx={{ 
+                      cursor: 'pointer', 
+                      '&:hover': { backgroundColor: 'action.hover' },
+                      p: 0.5,
+                      borderRadius: 1,
+                    }}
+                    onClick={() => setSettings({ ...settings, ollama_model: model.name })}
+                  >
                     • {model.name} ({(model.size / 1024 / 1024 / 1024).toFixed(1)} GB)
                   </Typography>
                 ))}