diff --git a/themes/grav/js/forms/form.js b/themes/grav/js/forms/form.js
index bb2d42ca..ab14545d 100644
--- a/themes/grav/js/forms/form.js
+++ b/themes/grav/js/forms/form.js
@@ -115,7 +115,7 @@
         this.scanned = true;
 
         //Refresh root.currentValues as toggleables have been initialized
-        //root.currentValues = getState();
+        (root || window.GravJS).currentValues = getState();
     };
 
     Form.factories = {};