--- a/frontends/src/tools/xmlui.py	Mon Nov 16 00:24:49 2015 +0100
+++ b/frontends/src/tools/xmlui.py	Mon Nov 16 08:57:02 2015 +0100
@@ -189,7 +189,6 @@
     def _xmluiSubmit(self, data):
         if self._xmlui_parent.submit_id is None:
             log.debug(_("Nothing to submit"))
-            self._xmluiClose()
         else:
             self._xmlui_parent.submit(data)
 
@@ -282,6 +281,7 @@
         return None
 
     def submit(self, data):
+        self._xmluiClose()
         if self.submit_id is None:
             raise ValueError("Can't submit is self.submit_id is not set")
         if "session_id" in data: