diff --git a/app/views/admin/announcements/_form.html.haml b/app/views/admin/announcements/_form.html.haml
new file mode 100644
index 000000000..3a9b37190
--- /dev/null
+++ b/app/views/admin/announcements/_form.html.haml
@@ -0,0 +1,28 @@
+.fields-group
+  = form.input :starts_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+  = form.input :ends_at,
+               html5: true,
+               include_blank: true,
+               input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+               wrapper: :with_block_label
+
+.fields-group
+  = form.input :all_day,
+               as: :boolean,
+               wrapper: :with_label
+
+.fields-group
+  = form.input :text,
+               wrapper: :with_block_label
+
+- unless form.object.published?
+  .fields-group
+    = form.input :scheduled_at,
+                 html5: true,
+                 include_blank: true,
+                 input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
+                 wrapper: :with_block_label
diff --git a/app/views/admin/announcements/edit.html.haml b/app/views/admin/announcements/edit.html.haml
index 23c568a88..8cec7d36c 100644
--- a/app/views/admin/announcements/edit.html.haml
+++ b/app/views/admin/announcements/edit.html.haml
@@ -1,37 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcement_path(@announcement), html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-    = f.input :ends_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :all_day,
-              as: :boolean,
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :text,
-              wrapper: :with_block_label
-
-  - unless @announcement.published?
-    .fields-group
-      = f.input :scheduled_at,
-                html5: true,
-                include_blank: true,
-                input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-                wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button, t('generic.save_changes'), type: :submit
+    = form.button :button,
+                  t('generic.save_changes'),
+                  type: :submit
diff --git a/app/views/admin/announcements/new.html.haml b/app/views/admin/announcements/new.html.haml
index a681ed789..266ca65e8 100644
--- a/app/views/admin/announcements/new.html.haml
+++ b/app/views/admin/announcements/new.html.haml
@@ -1,38 +1,12 @@
 - content_for :page_title do
   = t('.title')
 
-= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |f|
+= simple_form_for @announcement, url: admin_announcements_path, html: { novalidate: false } do |form|
   = render 'shared/error_messages', object: @announcement
 
-  .fields-group
-    = f.input :starts_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-    = f.input :ends_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :all_day,
-              as: :boolean,
-              wrapper: :with_label
-
-  .fields-group
-    = f.input :text,
-              wrapper: :with_block_label
-
-  .fields-group
-    = f.input :scheduled_at,
-              html5: true,
-              include_blank: true,
-              input_html: { pattern: datetime_pattern, placeholder: datetime_placeholder },
-              wrapper: :with_block_label
+  = render form
 
   .actions
-    = f.button :button,
-               t('.create'),
-               type: :submit
+    = form.button :button,
+                  t('.create'),
+                  type: :submit