diff --git a/src/postorius/templates/postorius/index.html b/src/postorius/templates/postorius/index.html
index df2a2fe..cd711f8 100644
--- a/src/postorius/templates/postorius/index.html
+++ b/src/postorius/templates/postorius/index.html
@@ -16,7 +16,9 @@
             {% if domain_count < 2 %}
                 <a class="btn btn-success" href="{% url 'domain_new' %}">{% trans 'Create New Domain' %}</a>
             {% endif %}
+            {% if domain_count >= 2 %}
             <a class="btn btn-success" href="{% url 'list_new' %}">{% trans 'Create New List' %}</a>
+            {% endif %}
         </p>
     {% endif %}
     {% if lists|length > 0 %}
diff --git a/src/postorius/views/list.py b/src/postorius/views/list.py
index 8bb777d..24b35c6 100644
--- a/src/postorius/views/list.py
+++ b/src/postorius/views/list.py
@@ -436,28 +436,31 @@
     be logged in to create a new list.
     """
     mailing_list = None
-    if request.method == 'POST':
+    if request.method == 'GET':
         choosable_domains = _get_choosable_domains(request)
-        form = ListNew(choosable_domains, request.POST)
-        if form.is_valid():
-            # grab domain
-            domain = Domain.objects.get_or_404(
-                mail_host=form.cleaned_data['mail_host'])
-            # creating the list
-            try:
-                mailing_list = domain.create_list(
-                    form.cleaned_data['listname'])
-                mailing_list.add_owner(form.cleaned_data['list_owner'])
-                list_settings = mailing_list.settings
-                list_settings["description"] = form.cleaned_data['description']
-                list_settings["advertised"] = form.cleaned_data['advertised']
-                list_settings.save()
-                messages.success(request, _("List created"))
-                return redirect("list_summary",
-                                list_id=mailing_list.list_id)
-            # TODO catch correct Error class:
-            except HTTPError as e:
-                return render(request, 'postorius/errors/generic.html', {'error': e})
+        if len(choosable_domains) > 1:
+            form = ListNew(choosable_domains, request.POST)
+            if form.is_valid():
+                # grab domain
+                domain = Domain.objects.get_or_404(
+                    mail_host=form.cleaned_data['mail_host'])
+                # creating the list
+                try:
+                    mailing_list = domain.create_list(
+                        form.cleaned_data['listname'])
+                    mailing_list.add_owner(form.cleaned_data['list_owner'])
+                    list_settings = mailing_list.settings
+                    list_settings["description"] = form.cleaned_data['description']
+                    list_settings["advertised"] = form.cleaned_data['advertised']
+                    list_settings.save()
+                    messages.success(request, _("List created"))
+                    return redirect("list_summary",
+                                    list_id=mailing_list.list_id)
+                # TODO catch correct Error class:
+                except HTTPError as e:
+                    return render(request, 'postorius/errors/generic.html', {'error': e})
+        else:
+            return redirect("/postorius/domains/new")
     else:
         choosable_domains = _get_choosable_domains(request)
         form = ListNew(choosable_domains,