diff --git a/www/form/app-form.less b/www/form/app-form.less
index f1e0c3dd0..343894af9 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -503,6 +503,9 @@
         }
     }
 
+    .cp-form-type-poll-container {
+        overflow: auto;
+    }
     .cp-form-type-poll {
         display: inline-flex;
         flex-flow: column;
diff --git a/www/form/inner.js b/www/form/inner.js
index a0385442b..290c98007 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -1441,7 +1441,7 @@ define([
                 addLine.unshift(h('div.cp-poll-cell', nameInput));
                 lines.push(h('div', addLine));
 
-                var tag = h('div', h('div.cp-form-type-poll', lines));
+                var tag = h('div.cp-form-type-poll-container', h('div.cp-form-type-poll', lines));
                 var $tag = $(tag);
 
                 var cursorGetter;