diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index b4fc51c..9245c1e 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -53,7 +53,11 @@
           <strong><label for="status">Type</label></strong>
           <select class="form-control custom-select" id="type" name="type">
             {% for type in types %}
-            <option selected value="{{ type }}">{{ type }}</option>
+              {% if type == 'default' %}
+                <option selected value="{{ type }}">{{ type }}</option>
+              {% else %}
+                <option value="{{ type }}">{{ type }}</option>
+              {% endif %}
             {% endfor %}
           </select>
           <div>
diff --git a/tests/test_pagure_flask_ui_issues_templates.py b/tests/test_pagure_flask_ui_issues_templates.py
index 3669cab..ea1a544 100644
--- a/tests/test_pagure_flask_ui_issues_templates.py
+++ b/tests/test_pagure_flask_ui_issues_templates.py
@@ -72,7 +72,7 @@ def create_templates(repopath):
         'Alice Author', 'alice@authors.tld')
     committer = pygit2.Signature(
         'Cecil Committer', 'cecil@committers.tld')
-    clone_repo.create_commit(
+    commit = clone_repo.create_commit(
         'refs/heads/master',  # the name of the reference to update
         author,
         committer,
@@ -83,6 +83,30 @@ def create_templates(repopath):
         [commit.hex]
     )
 
+    # Create the default.md template
+    template = os.path.join(repopath, 'templates', 'default.md')
+    with open(template, 'w') as stream:
+        stream.write('Report your issue')
+    clone_repo.index.add(os.path.join('templates', 'default.md'))
+    clone_repo.index.write()
+
+    # Commit
+    tree = clone_repo.index.write_tree()
+    author = pygit2.Signature(
+        'Alice Author', 'alice@authors.tld')
+    committer = pygit2.Signature(
+        'Cecil Committer', 'cecil@committers.tld')
+    clone_repo.create_commit(
+        'refs/heads/master',  # the name of the reference to update
+        author,
+        committer,
+        'Add a default template',
+        # binary string representing the tree object ID
+        tree,
+        # list of binary strings representing parents of the new commit
+        [commit.hex]
+    )
+
 
 class PagureFlaskIssuestests(tests.Modeltests):
     """ Tests for flask issues controller of pagure """
@@ -148,10 +172,13 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 '<select class="form-control custom-select" id="type" name="type">',
                 output_text)
             self.assertIn(
-                '<option selected value="RFE">RFE</option>',
+                '<option value="RFE">RFE</option>',
+                output_text)
+            self.assertIn(
+                '<option value="2018-bid">2018-bid</option>',
                 output_text)
             self.assertIn(
-                '<option selected value="2018-bid">2018-bid</option>',
+                '<option selected value="default">default</option>',
                 output_text)
 
     def test_get_ticket_template_no_csrf(self):