diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb
index 07712796ec..d7e10e1307 100644
--- a/app/helpers/work_packages_helper.rb
+++ b/app/helpers/work_packages_helper.rb
@@ -520,7 +520,9 @@ module WorkPackagesHelper
                             required: true)
               end
             elsif work_package.status
-              form.label(:status) + work_package.status.name
+              work_package_form_field do
+                form.label(:status, class: "form--label") + wrap_element_in_container(work_package.status.name)
+              end
             else
               form.label(:status) + empty_element_tag
             end
@@ -757,4 +759,10 @@ module WorkPackagesHelper
 
     [responsible, assignee].compact.join('<br>').html_safe
   end
+
+  def wrap_element_in_container(name)
+    content_tag :span, class: "form--field-container" do
+      content_tag :span, name, class: "form--text-field-container"
+    end
+  end
 end