diff --git a/luasrc/view/btcpayserver/status.htm b/luasrc/view/btcpayserver/status.htm
index 41039b7..1a55d66 100644
--- a/luasrc/view/btcpayserver/status.htm
+++ b/luasrc/view/btcpayserver/status.htm
@@ -2,29 +2,21 @@
 local util  = require "luci.util"
 local container_status = util.trim(util.exec("/usr/libexec/apps/btcpayserver/btcpayserver.sh status"))
 local container_running = string.match(string.lower(container_status), "^up%W")
+local port = util.trim(util.exec("/usr/libexec/apps/btcpayserver/btcpayserver.sh port"))
 -%>
 
 <div class="cbi-value">
     <div class="cbi-value-field">
         <% if container_running then %>
             <button class="cbi-button cbi-button-success" disabled="true"><%= container_status %></button>
+            <%
+            if port == "" then
+                port = "3000"
+            end
+            -%>
+            <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open btcpayserver%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
         <% else %>
             <button class="cbi-button cbi-button-negative" disabled="true"><%= container_status %></button>
         <% end %>
     </div>
 </div>
-
-<%
-if container_running then
-    local port = util.trim(util.exec("/usr/libexec/apps/btcpayserver/btcpayserver.sh port"))
-    if port == "" then
-        port = "3000"
-    end
--%>
-<div class="cbi-value cbi-value-last">
-    <label class="cbi-value-title">&nbsp;</label>
-    <div class="cbi-value-field">
-        <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open btcpayserver%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
-    </div>
-</div>
-<% end %>