diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index c60b8081c..65912b881 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -983,8 +983,10 @@ public:
   }
 
   void showPopup() {
-    if (!m_popup)
+    if (!m_popup) {
       m_popup.reset(new DynamicsPopup(this));
+      m_popup->Close.connect([this](CloseEvent&){ deselectItems(); });
+    }
 
     const gfx::Rect bounds = this->bounds();
     m_popup->remapWindow();