diff --git a/instances/templates/instances/settings_tab.html b/instances/templates/instances/settings_tab.html
index c267f7b3..e8a12997 100644
--- a/instances/templates/instances/settings_tab.html
+++ b/instances/templates/instances/settings_tab.html
@@ -343,48 +343,60 @@
                         <div class="modal fade" id="editInstanceNetwork{{ forloop.counter0 }}" tabindex="-1" aria-labelledby="editInstanceNetworkLabel{{ forloop.counter0 }}" aria-hidden="true">
                             <div class="modal-dialog">
                                 <div class="modal-content">
-                                    <div class="modal-header">
-                                        <h5 class="modal-title" id="editInstanceNetworkLabel{{ forloop.counter0 }}">{% blocktrans with nic=forloop.counter0 %}Edit eth{{ nic }}{% endblocktrans %}</h5>
+                                    <div class="modal-header align-items-start">
+                                        <div>
+                                            <h5 class="modal-title" id="editInstanceNetworkLabel{{ forloop.counter0 }}">{% blocktrans with nic=forloop.counter0 %}Edit eth{{ nic }}{% endblocktrans %}</h5>
+                                            <p class="small text-body-secondary mb-0 mt-1">{{ network.model|default:"—" }} · {{ network.mac }}</p>
+                                        </div>
                                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans "Close" %}"></button>
                                     </div>
                                     <div class="modal-body">
+                                        {% if instance.status != 5 %}
+                                            <p class="small text-body-secondary">{% trans "The VM is running: the changes apply at its next start." %}</p>
+                                        {% endif %}
                                         <input type="hidden" name="net-old-mac-{{ forloop.counter0 }}" value="{{ network.mac }}">
-                                        <div class="mb-3">
-                                            <label class="form-label" for="net-mac-{{ forloop.counter0 }}">{% trans "MAC" %}</label>
-                                            <input class="form-control" type="text" id="net-mac-{{ forloop.counter0 }}" name="net-mac-{{ forloop.counter0 }}" value="{{ network.mac }}">
-                                        </div>
-                                        <div class="mb-3">
-                                            <label class="form-label" for="net-source-{{ forloop.counter0 }}">{% trans "Net Source" %}</label>
-                                            <select class="form-select" id="net-source-{{ forloop.counter0 }}" name="net-source-{{ forloop.counter0 }}">
-                                                {% for c_net in networks_host %}
-                                                <option value="net:{{ c_net }}"{% if c_net == network.nic %} selected{% endif %}>{% trans 'Network' %} {{ c_net }}</option>
-                                                {% endfor %}
-                                                {% for c_iface in interfaces_host %}
-                                                <option value="iface:{{ c_iface }}"{% if c_iface == network.nic %} selected{% endif %}>{% trans 'Interface' %} {{ c_iface }}</option>
-                                                {% endfor %}
-                                            </select>
-                                        </div>
-                                        <div class="mb-3">
-                                            <label class="form-label" for="net-nwfilter-{{ forloop.counter0 }}">{% trans "NWFilter" %}</label>
-                                            <select class="form-select" id="net-nwfilter-{{ forloop.counter0 }}" name="net-nwfilter-{{ forloop.counter0 }}">
-                                                <option value="">{% trans "None" %}</option>
-                                                {% for c_filters in nwfilters_host %}
-                                                <option value="{{ c_filters }}"{% if c_filters == network.filterref %} selected{% endif %}>{{ c_filters }}</option>
-                                                {% endfor %}
-                                            </select>
-                                        </div>
-                                        <div>
-                                            <label class="form-label" for="net-model-{{ forloop.counter0 }}">{% trans "Model" %}</label>
-                                            <select class="form-select" id="net-model-{{ forloop.counter0 }}" name="net-model-{{ forloop.counter0 }}">
-                                                {% for model in net_models_host %}
-                                                <option value="{{ model }}"{% if model == network.model %} selected{% endif %}>{{ model }}</option>
-                                                {% endfor %}
-                                            </select>
+                                        <div class="row g-3">
+                                            <div class="col-12">
+                                                <label class="form-label" for="net-source-{{ forloop.counter0 }}">{% trans "Source" %}</label>
+                                                <select class="form-select" id="net-source-{{ forloop.counter0 }}" name="net-source-{{ forloop.counter0 }}">
+                                                    <optgroup label="{% trans "Networks" %}">
+                                                        {% for c_net in networks_host %}
+                                                        <option value="net:{{ c_net }}"{% if c_net == network.nic %} selected{% endif %}>{{ c_net }}</option>
+                                                        {% endfor %}
+                                                    </optgroup>
+                                                    <optgroup label="{% trans "Interfaces" %}">
+                                                        {% for c_iface in interfaces_host %}
+                                                        <option value="iface:{{ c_iface }}"{% if c_iface == network.nic %} selected{% endif %}>{{ c_iface }}</option>
+                                                        {% endfor %}
+                                                    </optgroup>
+                                                </select>
+                                            </div>
+                                            <div class="col-sm-6">
+                                                <label class="form-label" for="net-model-{{ forloop.counter0 }}">{% trans "Model" %}</label>
+                                                <select class="form-select" id="net-model-{{ forloop.counter0 }}" name="net-model-{{ forloop.counter0 }}">
+                                                    {% for model in net_models_host %}
+                                                    <option value="{{ model }}"{% if model == network.model %} selected{% endif %}>{{ model }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
+                                            <div class="col-sm-6">
+                                                <label class="form-label" for="net-nwfilter-{{ forloop.counter0 }}">{% trans "NWFilter" %}</label>
+                                                <select class="form-select" id="net-nwfilter-{{ forloop.counter0 }}" name="net-nwfilter-{{ forloop.counter0 }}">
+                                                    <option value="">{% trans "None" %}</option>
+                                                    {% for c_filters in nwfilters_host %}
+                                                    <option value="{{ c_filters }}"{% if c_filters == network.filterref %} selected{% endif %}>{{ c_filters }}</option>
+                                                    {% endfor %}
+                                                </select>
+                                            </div>
+                                            <div class="col-12">
+                                                <label class="form-label" for="net-mac-{{ forloop.counter0 }}">{% trans "MAC" %}</label>
+                                                <input class="form-control font-monospace" type="text" id="net-mac-{{ forloop.counter0 }}" name="net-mac-{{ forloop.counter0 }}" value="{{ network.mac }}">
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="modal-footer">
-                                        <button class="btn btn-secondary" type="button" data-bs-dismiss="modal">{% trans 'Close' %}</button>
-                                        <button class="btn btn-primary" name="change_network">{% trans "Apply" %}</button>
+                                        <button class="btn btn-outline-secondary" type="button" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
+                                        <button class="btn btn-primary" name="change_network">{% trans "Save" %}</button>
                                     </div>
                                 </div>
                             </div>
diff --git a/instances/tests/test_pending_edits.py b/instances/tests/test_pending_edits.py
index 0ba522df..b118784d 100644
--- a/instances/tests/test_pending_edits.py
+++ b/instances/tests/test_pending_edits.py
@@ -85,11 +85,18 @@ class PendingEditsTestCase(TestCase):
         nic = {"type": "network", "mac": "52:54:10:00:00:01", "nic": "default", "state": "up", "model": "virtio",
                "ipv4": None, "ipv6": None, "filterref": "", "target": "", "inbound": [], "outbound": []}
         nics = [nic, {**nic, "mac": "52:54:10:00:00:02"}]
-        doc = self.page(nics=(nics, nics))
+        doc = self.page(nics=(nics, nics), get_networks=(["default", "isolated"],) * 2, get_ifaces=(["br0"],) * 2)
         rows = doc.xpath("//div[@id='network']//div[contains(@class, 'list-group')]/*")
         # nothing but the rows sits in the list: each row holds its Edit and Add QoS dialogs
         self.assertEqual([row.get("aria-labelledby") for row in rows], ["nic-0", "nic-1"])
         self.assertEqual([len(row.xpath(".//div[contains(@class, 'modal')][@id]")) for row in rows], [2, 2])
+        # the Edit dialog picks the source by kind and posts it as before
+        (source,) = doc.xpath("//select[@name='net-source-0']")
+        self.assertEqual(source.xpath("./optgroup/@label"), ["Networks", "Interfaces"])
+        self.assertEqual(source.xpath(".//option/@value"), ["net:default", "net:isolated", "iface:br0"])
+        self.assertEqual(source.xpath(".//option[@selected]/@value"), ["net:default"])
+        self.assertEqual(doc.xpath("//div[@id='editInstanceNetwork0']//input[@name='net-old-mac-0']/@value"), [nic["mac"]])
+        self.assertTrue(doc.xpath("//div[@id='editInstanceNetwork0']//button[@name='change_network']"))
 
     def test_the_disks_are_rows_of_one_list(self):
         disks = [disk("vda", "default", "") | {"used": 1 << 29}, disk("vdb", "default", "") | {"used": (1 << 30) + (1 << 20)}]