diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb
index f2af62de6..2e7a1634b 100644
--- a/app/assets/javascripts/protocols/steps.js.erb
+++ b/app/assets/javascripts/protocols/steps.js.erb
@@ -267,7 +267,10 @@
     if (show) {
       $("[data-action='new-step']:first").show();
       $("[data-action='edit-step']").show();
-      if ($('#steps .step').length > 0) $("[data-action='new-step']:last").show();
+      if ($('#steps .step').length > 0) {
+        $("[data-action='new-step']:last").show();
+        $(".expand-all-steps").show();
+      } 
     } else {
       $("[data-action='new-step']").hide();
       $("[data-action='edit-step']").hide();
diff --git a/app/views/protocols/_steps.html.erb b/app/views/protocols/_steps.html.erb
index 64874b4cf..8740fa4c6 100644
--- a/app/views/protocols/_steps.html.erb
+++ b/app/views/protocols/_steps.html.erb
@@ -10,8 +10,7 @@
         <span class="hidden-xs"><%=t "protocols.steps.new_step" %></span>
       </a>
   </div>
-  <% unless @protocol.steps.empty? %>
-  <div class="pull-right" style="margin: 0 15px 20px 0;">
+  <div class="pull-right expand-all-steps" style="margin: 0 15px 20px 0; display: <%= 'none' if @protocol.steps.empty? %>">
     <a class="btn btn-default" data-action="collapse-steps">
       <span class="fas fa-caret-square-up"></span>
       <span class="hidden-xs"><%= t("protocols.steps.collapse_label") %></a></span>
@@ -19,7 +18,6 @@
       <span class="fas fa-caret-square-down"></span>
       <span class="hidden-xs"><%= t("protocols.steps.expand_label") %></a></span>
   </div>
-  <% end %>
 </div>
 <% end %>
 <div id="steps">