diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
index f959ec86e98065bfa50c34d4de126deb1010ac7f..6e12e9ed6eacfb245a7c2e77b73b214b3a1062cc 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -26,7 +26,7 @@ THE SOFTWARE.
 <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>
           <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
-              <a href="${h.getRelativeLinkTo(job)}build?delay=0sec">
+              <a href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
                   <img src="${imagesURL}/${subIconSize}/clock.png"
                        title="${%Schedule a build}" alt="${%Schedule a build}"
                        onclick="${job.parameterized ? null : 'return build(this)'}"
diff --git a/core/src/main/resources/hudson/views/JobColumn/column.jelly b/core/src/main/resources/hudson/views/JobColumn/column.jelly
index 619a1e4b0983c154c030c56afd2fd310f60b4cc4..797cf0378799f4ad917c1b868e3daf5bc0440f53 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="${h.getRelativeLinkTo(job)}" class='model-link'> ${useFullName ? job.fullDisplayName : h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)}</a>
+        <a href="${jobBaseUrl}${job.shortUrl}" class='model-link'> ${useFullName ? job.fullDisplayName : h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)}</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 3c51eaeac7b7aaee6d5fc18f8fb041c8b69db431..611958584f4073f0282c6a6223ce162063745648 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -79,7 +79,8 @@ THE SOFTWARE.
         </j:forEach>
 
         <j:forEach var="job" items="${jobs}">
-          <t:projectViewRow jobBaseUrl="${useFullName ? (jobBaseUrl ? jobBaseUrl + job.parent.url : job.parent.url) : jobBaseUrl}"/>
+          <j:set var="parentRelativeLink" value="${h.getRelativeLinkTo(job.parent)}"/>
+          <t:projectViewRow jobBaseUrl="${parentRelativeLink=='.'?'':parentRelativeLink}${jobBaseUrl}"/>
         </j:forEach>
       </table>
       <t:iconSize><t:rssBar/></t:iconSize>