diff --git a/src/js/yunohost/controllers/apps.js b/src/js/yunohost/controllers/apps.js
index ddb4193e..9f77377b 100644
--- a/src/js/yunohost/controllers/apps.js
+++ b/src/js/yunohost/controllers/apps.js
@@ -463,6 +463,7 @@
                     });
                 });
 
+                args[k].choices[params.domains_main].selected = true;
                 // Custom help link
                 args[k].helpLink += "<a href='#/domains'>"+y18n.t('manage_domains')+"</a>";
             }
diff --git a/src/js/yunohost/filters.js b/src/js/yunohost/filters.js
index aa7f6722..94fef552 100644
--- a/src/js/yunohost/filters.js
+++ b/src/js/yunohost/filters.js
@@ -14,6 +14,7 @@
         req.params.domains = [];
         req.api('GET', '/domains', {}, function(data) {
             req.params.domains = data.domains;
+            req.params.domains_main = data.main;
         });
     }