diff --git a/www/form/inner.js b/www/form/inner.js
index 40f551f0d..a95f256ae 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -99,7 +99,8 @@ define([
     // we'll consider increasing this restriction if people are unhappy with it
     // but as a general rule we expect users will appreciate having simpler questions
     var MAX_OPTIONS = 25;
-    var MAX_ITEMS = 10;
+    var MAX_ITEMS = 25;
+
 
     var getOptionValue = function (obj) {
         if (!Util.isObject(obj)) { return obj; }
@@ -4484,6 +4485,12 @@ define([
         APP.isEditor = Boolean(priv.form_public);
         var $body = $('body');
 
+        if (priv.devMode) {
+            MAX_OPTIONS = 10000;
+            MAX_ITEMS = 10000;
+        }
+
+
         var $toolbarContainer = $('#cp-toolbar');
 
         var helpMenu = framework._.sfCommon.createHelpMenu(['text', 'pad']);