diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 4b1cb8a..459ebbb 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -535,13 +535,13 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
     w->setDigital(info.flags & PA_SINK_SET_FORMATS);
 #endif
 
-    w->updating = false;
-
     w->prepareMenu();
 
     if (is_new)
         updateDeviceVisibility();
 
+    w->updating = false;
+
     return is_new;
 }
 
@@ -698,12 +698,12 @@ void MainWindow::updateSource(const pa_source_info &info) {
     if (cw != cardWidgets.end())
         updatePorts(w, cw->second->ports);
 
-    w->updating = false;
-
     w->prepareMenu();
 
     if (is_new)
         updateDeviceVisibility();
+
+    w->updating = false;
 }
 
 void MainWindow::setIconFromProplist(Gtk::Image *icon, pa_proplist *l, const char *def) {