diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
index 97d6d01fb1d91..10d3acaa4e1bd 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -148,9 +148,9 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
       <td>{formatResourcesAddresses(executor.resources)}</td>
       <td>{executor.state}</td>
       <td>
-        <a href={s"$workerUrlRef/logPage?appId=${executor.application.id}&executorId=${executor.
+        <a href={s"$workerUrlRef/logPage/?appId=${executor.application.id}&executorId=${executor.
           id}&logType=stdout"}>stdout</a>
-        <a href={s"$workerUrlRef/logPage?appId=${executor.application.id}&executorId=${executor.
+        <a href={s"$workerUrlRef/logPage/?appId=${executor.application.id}&executorId=${executor.
           id}&logType=stderr"}>stderr</a>
       </td>
     </tr>
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index 9e1f753b51e5a..99dd3ac1d53b3 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -284,7 +284,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
     }
     <tr>
       <td>
-        <a href={"app?appId=" + app.id}>{app.id}</a>
+        <a href={"app/?appId=" + app.id}>{app.id}</a>
         {killLink}
       </td>
       <td>
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala b/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
index 6945cb5a947eb..910c27fc71044 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/DriverRunner.scala
@@ -196,9 +196,9 @@ private[deploy] class DriverRunner(
     val reverseProxy = conf.get(UI_REVERSE_PROXY)
     val workerUrlRef = UIUtils.makeHref(reverseProxy, driverId, workerWebUiUrl)
     builder.environment.put("SPARK_DRIVER_LOG_URL_STDOUT",
-      s"$workerUrlRef/logPage?driverId=$driverId&logType=stdout")
+      s"$workerUrlRef/logPage/?driverId=$driverId&logType=stdout")
     builder.environment.put("SPARK_DRIVER_LOG_URL_STDERR",
-      s"$workerUrlRef/logPage?driverId=$driverId&logType=stderr")
+      s"$workerUrlRef/logPage/?driverId=$driverId&logType=stderr")
 
     runDriver(builder, driverDir, driverDesc.supervise)
   }
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
index ce0863dd293bd..3171d3f16e8a0 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
@@ -189,9 +189,9 @@ private[ui] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
         </ul>
       </td>
       <td>
-        <a href={s"$workerUrlRef/logPage?appId=${executor
+        <a href={s"$workerUrlRef/logPage/?appId=${executor
           .appId}&executorId=${executor.execId}&logType=stdout"}>stdout</a>
-        <a href={s"$workerUrlRef/logPage?appId=${executor
+        <a href={s"$workerUrlRef/logPage/?appId=${executor
           .appId}&executorId=${executor.execId}&logType=stderr"}>stderr</a>
       </td>
     </tr>