diff --git a/browser/form.py b/browser/form.py
index cae6b05..62e8b1b 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -79,8 +79,7 @@ class ObjectForm(NodeView):
 
     def closeAction(self, submit=False):
         if self.isInnerHtml:
-            return ("closeDataWidget(%s); dialog.hide();" %
-                        (submit and 'true' or 'false'))
+            return "return closeDialog(%s);" % (submit and 'true' or 'false')
         if submit:
             return "xhrSubmitPopup('dialog_form', '%s'); return false" % (self.request.URL)
         return 'window.close()'
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index 1cd0d86..5779aba 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -4,6 +4,7 @@
 <metal:block define-macro="edit" i18n:domain="loops">
     <form method="post" enctype="multipart/form-data"
           id="dialog_form" class="dialog"
+          dojoType="dijit.form.Form"
           tal:define="langInfo view/languageInfo;
                       languages langInfo/availableLanguages;
                       language langInfo/language;
diff --git a/browser/loops.js b/browser/loops.js
index a0ff1e6..00055df 100644
--- a/browser/loops.js
+++ b/browser/loops.js
@@ -143,6 +143,30 @@ function addConceptAssignment(prefix, suffix) {
     node.appendChild(tr);
 }
 
+function validate() {
+    var form = dijit.byId('dialog_form');
+    if (form != undefined && !form.isValid()) {
+        return false;
+    }
+    var titleField = dojo.byId('title');
+    if (titleField != undefined && titleField.value == '') {
+        return false;
+    }
+    if (form != undefined) {
+        return form.submit();
+    }
+    return true;
+}
+
+function closeDialog(save) {
+    if (save && !validate()) {
+        return false;
+    }
+    closeDataWidget(save);
+    dialog.hide();
+    return true;
+}
+
 function closeDataWidget(save) {
     var widget = dijit.byId('data');
     if (widget != undefined && save) {