diff --git a/www/form/main.js b/www/form/main.js
index 3d9d6e263..f4e0fc751 100644
--- a/www/form/main.js
+++ b/www/form/main.js
@@ -57,8 +57,10 @@ define([
         var id = uid();
         var type = getInputType($this);
 
-        // ignore hidden elements
-        if (type === 'hidden') { return; }
+        // ignore hidden inputs, submit inputs, and buttons
+        if (['button', 'submit', 'hidden'].indexOf(type) !== -1) {
+            return;
+        }
 
         $this   // give each element a uid
             .data('rtform-uid', id)