diff --git a/changelog.html b/changelog.html
index 398fedbdbdfe19fe806f464f4d62ae30ed11ca38..be391a3e89e2bd16c25834a181cf43594cc995ec 100644
--- a/changelog.html
+++ b/changelog.html
@@ -58,6 +58,9 @@ Upcoming changes</a>
   <li class=bug>
     Update logging levels in LogRotator - hudson.tasks.LogRotator perform
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15540">issue 15540</a>)
+  <li class=bug>
+    Jobs in folders not displayed when showing tied jobs for a computer or label.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15666">issue 15666</a>)
   <li class=bug>
     When installing plugins with overlapping dependencies, Jenkins downloads the duplicate plugins multiple times.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10569">issue 10569</a>)
diff --git a/core/src/main/java/hudson/model/Label.java b/core/src/main/java/hudson/model/Label.java
index 4260a4c5f6741751b57466e634f7cc7c0b1eddfa..96bd681e8b72955e15347b0d1f96e0ed337b17ee 100644
--- a/core/src/main/java/hudson/model/Label.java
+++ b/core/src/main/java/hudson/model/Label.java
@@ -24,7 +24,6 @@
 package hudson.model;
 
 import antlr.ANTLRException;
-import hudson.Util;
 import static hudson.Util.fixNull;
 
 import hudson.model.labels.LabelAtom;
@@ -336,7 +335,7 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
     @Exported
     public List<AbstractProject> getTiedJobs() {
         List<AbstractProject> r = new ArrayList<AbstractProject>();
-        for( AbstractProject p : Util.filter(Jenkins.getInstance().getItems(),AbstractProject.class) ) {
+        for (AbstractProject<?,?> p : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
             if(this.equals(p.getAssignedLabel()))
                 r.add(p);
         }
diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly
index a7fdc01a56b344db49fe4281dc38fb48d212b4b9..011d69cd92b6cfbdcf5290054c5d1c1bb0eb505c 100644
--- a/core/src/main/resources/hudson/model/Computer/index.jelly
+++ b/core/src/main/resources/hudson/model/Computer/index.jelly
@@ -111,7 +111,7 @@ THE SOFTWARE.
           </p>
         </j:when>
         <j:otherwise>
-          <t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" />
+          <t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" useFullName="true"/>
         </j:otherwise>
       </j:choose>
 
diff --git a/core/src/main/resources/hudson/model/Label/index.jelly b/core/src/main/resources/hudson/model/Label/index.jelly
index 1bfc98420fe7095993e6e55045b104bd3fad2b9e..c5d366f6ae600b75dc7ddefc5d1b6e0d1db03285 100644
--- a/core/src/main/resources/hudson/model/Label/index.jelly
+++ b/core/src/main/resources/hudson/model/Label/index.jelly
@@ -53,7 +53,7 @@ THE SOFTWARE.
           </p>
         </j:when>
         <j:otherwise>
-          <t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" />
+          <t:projectView jobs="${it.tiedJobs}" jobBaseUrl="${rootURL}/" useFullName="true"/>
         </j:otherwise>
       </j:choose>
 
diff --git a/core/src/main/resources/hudson/views/JobColumn/column.jelly b/core/src/main/resources/hudson/views/JobColumn/column.jelly
index 5ac789b417f271c2d8041ca21ac2eca186cbcb54..4d30d67d596e4b357defab1bcfd907f29ca36ec0 100644
--- a/core/src/main/resources/hudson/views/JobColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/JobColumn/column.jelly
@@ -25,6 +25,6 @@ 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">
     <td style="${indenter.getCss(job)}">
-        <a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${job.displayName}</a>
+        <a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${useFullName ? job.fullDisplayName : job.displayName}</a>
     </td>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index f0a196478260c882392c899589e3fb5c4b6bedb9..895329966c3ee156feae7860f68142b465ad05e2 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -29,7 +29,11 @@ THE SOFTWARE.
     Renders a list of jobs and their key information.
 
     <st:attribute name="jobs" use="required" trim="Collection">
-      Items to disable.
+      Items to show.
+    </st:attribute>
+    <st:attribute name="useFullName" use="optional" type="boolean">
+      May be interpreted by columns to display the full name of a job.
+      Will also append a parent URL to jobBaseUrl if needed.
     </st:attribute>
     <st:attribute name="jobBaseUrl" type="String">
       The base URL of all job links. Normally ${rootURL}/
@@ -75,7 +79,7 @@ THE SOFTWARE.
         </j:forEach>
 
         <j:forEach var="job" items="${jobs}">
-          <t:projectViewRow />
+          <t:projectViewRow jobBaseUrl="${useFullName ? jobBaseUrl + job.parent.url : jobBaseUrl}"/>
         </j:forEach>
       </table>
       <t:iconSize><t:rssBar/></t:iconSize>