2 files changed, 22 insertions, 5 deletions
diff --git a/src/shared/urls.ts b/src/shared/urls.ts
index ab01c49..8fa9a49 100644
--- a/src/shared/urls.ts
+++ b/src/shared/urls.ts
@@ -16,6 +16,20 @@ const isLocalhost = (url: string): boolean => {
   return host === 'localhost' && !isNaN(Number(port));
 };
 
+const isMissingHttp = (keywords: string): boolean => {
+  if (keywords.includes('.') && !keywords.includes(' ')) {
+    return true;
+  }
+
+  try {
+    let u = new URL('http://' + keywords);
+    return isLocalhost(u.host)
+  } catch (e) {
+    // fallthrough
+  }
+  return false;
+};
+
 const searchUrl = (keywords: string, search: Search): string => {
   try {
     let u = new URL(keywords);
@@ -25,10 +39,11 @@ const searchUrl = (keywords: string, search: Search): string => {
   } catch (e) {
     // fallthrough
   }
-  if (isLocalhost(keywords) ||
-      (keywords.includes('.') && !keywords.includes(' '))) {
+
+  if (isMissingHttp(keywords)) {
     return 'http://' + keywords;
   }
+
   let template = search.engines[search.defaultEngine];
   let query = keywords;
 
diff --git a/test/shared/urls.test.ts b/test/shared/urls.test.ts
index d6f0550..6206d03 100644
--- a/test/shared/urls.test.ts
+++ b/test/shared/urls.test.ts
@@ -41,13 +41,15 @@ describe("shared/commands/parsers", () => {
       expect(parsers.searchUrl('localhost', config))
 	.to.equal('http://localhost');
       expect(parsers.searchUrl('http://localhost', config))
-	.to.equal('http://localhost');
+	.to.equal('http://localhost/');
       expect(parsers.searchUrl('localhost:8080', config))
-	.to.equal('http://locahost:8080');
+	.to.equal('http://localhost:8080');
       expect(parsers.searchUrl('localhost:80nan', config))
-	.to.equal('https://google.com/search?q=localhost:80nan');
+	.to.equal('https://google.com/search?q=localhost%3A80nan');
       expect(parsers.searchUrl('localhost 8080', config))
 	.to.equal('https://google.com/search?q=localhost%208080');
+      expect(parsers.searchUrl('localhost:80/build', config))
+	.to.equal('http://localhost:80/build')
     })
   });