diff --git a/app/templates/partials/server_edit.html b/app/templates/partials/server_edit.html
index 89170dc..72ca55f 100644
--- a/app/templates/partials/server_edit.html
+++ b/app/templates/partials/server_edit.html
@@ -74,7 +74,9 @@
             <label class="text-xs text-gray-500">Solution applicative <span class="text-gray-600">— modif locale uniquement</span></label>
             <select name="application_id" class="w-full">
                 <option value="">-- Aucune --</option>
-                {% for a in applications %}<option value="{{ a.id }}" {% if a.id == s.application_id %}selected{% endif %}>{{ a.nom_court }}</option>{% endfor %}
+                {% for a in applications %}<option value="{{ a.id }}"
+                    {% if (s.application_id and a.id == s.application_id)
+                       or (not s.application_id and s.application_name and a.nom_court|lower == s.application_name|lower) %}selected{% endif %}>{{ a.nom_court }}</option>{% endfor %}
             </select>
         </div>
         <div>