diff --git a/www/form/app-form.less b/www/form/app-form.less
index a577ea661..c28d164ed 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -275,6 +275,11 @@
                         input:invalid {
                             border: 1px solid @cp_form-invalid;
                         }
+                        media-tag {
+                            & > * {
+                                max-width: 100%;
+                            }
+                        }
                     }
                     .cp-form-input-block {
                         //width: @form_input-width;
diff --git a/www/form/inner.js b/www/form/inner.js
index cb79fa5a0..a82a47039 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -490,6 +490,7 @@ define([
                     $(addMultiple).hide();
                 }
             } else {
+                $(addMultiple).hide();
                 $calendar.show();
                 $container.hide();
             }