diff --git a/js/app.js b/js/app.js
index f853f152..900e0e03 100644
--- a/js/app.js
+++ b/js/app.js
@@ -892,9 +892,12 @@ app = Sammy('#main', function (sam) {
         delete c.params['label'];
         delete c.params['url'];
 
+        // Force trailing slash
+        params.app = params.app.replace(/\/?$/, '/');
+
         // Get manifest.json to get additional parameters
         jQuery.ajax({
-            url: params.app.replace('github.com', 'rawgit.com') + '/master/manifest.json',
+            url: params.app.replace('github.com', 'rawgit.com') + 'master/manifest.json',
             type: 'GET',
             crossdomain: true,
             dataType: 'json',
diff --git a/views/app/app_list.ms b/views/app/app_list.ms
index 4e1a925f..e23d4f28 100644
--- a/views/app/app_list.ms
+++ b/views/app/app_list.ms
@@ -55,7 +55,7 @@
             <div class="form-group has-feedback">
                 <label for="label" class="col-sm-12">{{t 'url'}}</label>
                 <div class="col-sm-12">
-                    <input type="url" id="url" name="url" class="form-control" value="" placeholder="https://github.com/USER/REPOSITORY" required pattern="^https://github.com/[a-z-_]*/[a-z-_]*">
+                    <input type="url" id="url" name="url" class="form-control" value="" placeholder="https://github.com/USER/REPOSITORY" required pattern="^https://github.com/[a-z-_]+/[a-z-_]+[/]?$">
                     <p class="text-warning">
                         <span class="fa-github"></span> {{t 'custom_app_url_only_github'}}
                     </p>