diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c
index f508c66..d0d787b 100644
--- a/shellinabox/shellinaboxd.c
+++ b/shellinabox/shellinaboxd.c
@@ -613,17 +613,16 @@ static int shellInABoxHttpHandler(HttpConnection *http, void *arg,
   const HashMap *headers  = httpGetHeaders(http);
   const char *contentType = getFromHashMap(headers, "content-type");
 
-  // Normalize the path info
+  // Normalize the path info, present the final path element
   const char *pathInfo    = urlGetPathInfo(url);
-  while (*pathInfo == '/') {
-    pathInfo++;
+  int pathInfoLength = 0;
+  pathInfo = strrchr (pathInfo, '/');
+  if (pathInfo) {
+    ++pathInfo;
+  } else {
+    pathInfo = "";              // Cheap way to get an empty string
   }
-  const char *endPathInfo;
-  for (endPathInfo        = pathInfo;
-       *endPathInfo && *endPathInfo != '/';
-       endPathInfo++) {
-  }
-  int pathInfoLength      = endPathInfo - pathInfo;
+  pathInfoLength = strlen (pathInfo);
 
   if (!pathInfoLength ||
       (pathInfoLength == 5 && !memcmp(pathInfo, "plain", 5)) ||