diff --git a/app/views/shop/_messages.html.haml b/app/views/shop/_messages.html.haml
index 4ec821882f..58032f9fb9 100644
--- a/app/views/shop/_messages.html.haml
+++ b/app/views/shop/_messages.html.haml
@@ -6,8 +6,4 @@
     = render partial: "shop/closed_shop"
 
   - else
-    .content
-      .row
-        .small-12.columns
-          .shopfront-message
-            = current_distributor.preferred_shopfront_message.html_safe
+    = render partial: "shop/messages/open_shop"
diff --git a/app/views/shop/messages/_open_shop.html.haml b/app/views/shop/messages/_open_shop.html.haml
new file mode 100644
index 0000000000..99142bb873
--- /dev/null
+++ b/app/views/shop/messages/_open_shop.html.haml
@@ -0,0 +1,5 @@
+.content
+  .row
+    .small-12.columns
+      .shopfront-message
+        = current_distributor.preferred_shopfront_message.html_safe