diff --git a/changelog.html b/changelog.html
index 6a93d1f857b5aef4434f42fc6e837662a65b42d5..75b9fca8ee30756333bd5cbbe33a786696bae873 100644
--- a/changelog.html
+++ b/changelog.html
@@ -83,6 +83,10 @@ Upcoming changes</a>
   <li class=bug>
     Maven2 job fails when using maven-failsafe-plugin
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15865">issue 15865</a>)
+  <li class=bug>
+    "Disable Project" button breaks Free style project pages.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15887">issue 15887</a>)
+    
 
 </ul>
 </div><!--=TRUNK-END=-->
diff --git a/core/src/main/resources/hudson/model/AbstractProject/main.jelly b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
index ceb1829cc9538c7086fa60c13d1c73e471045416..e60dc3ca64b036f27e3638f80b84ed69a29b0939 100644
--- a/core/src/main/resources/hudson/model/AbstractProject/main.jelly
+++ b/core/src/main/resources/hudson/model/AbstractProject/main.jelly
@@ -25,12 +25,13 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
-  <p:projectActionFloatingBox />
 
   <j:if test="${it.supportsMakeDisabled()}">
     <st:include page="makeDisabled.jelly" />
   </j:if>
 
+  <p:projectActionFloatingBox />
+  
   <table style="margin-top: 1em; margin-left:1em;">
 
     <j:forEach var="act" items="${it.prominentActions}">