diff --git a/plinth/modules/gitweb/templates/gitweb_create_edit.html b/plinth/modules/gitweb/templates/gitweb_create_edit.html
deleted file mode 100644
index 2e08d5ebf..000000000
--- a/plinth/modules/gitweb/templates/gitweb_create_edit.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-# SPDX-License-Identifier: AGPL-3.0-or-later
-{% endcomment %}
-
-{% load bootstrap %}
-{% load i18n %}
-{% load static %}
-
-{% block content %}
-
-  <h3>{{ title }}</h3>
-
-  <form class="form" method="post">
-    {% csrf_token %}
-
-    {{ form|bootstrap }}
-
-    <input type="submit" class="btn btn-primary"
-           value="{% trans "Submit" %}"/>
-  </form>
-
-{% endblock %}
diff --git a/plinth/modules/gitweb/views.py b/plinth/modules/gitweb/views.py
index 6404649be..a963fcb8d 100644
--- a/plinth/modules/gitweb/views.py
+++ b/plinth/modules/gitweb/views.py
@@ -42,7 +42,7 @@ class CreateRepoView(SuccessMessageMixin, FormView):
 
     form_class = CreateRepoForm
     prefix = 'gitweb'
-    template_name = 'gitweb_create_edit.html'
+    template_name = 'form.html'
     success_url = reverse_lazy('gitweb:index')
     success_message = _('Repository created.')
 
@@ -81,7 +81,7 @@ class EditRepoView(SuccessMessageMixin, FormView):
 
     form_class = EditRepoForm
     prefix = 'gitweb'
-    template_name = 'gitweb_create_edit.html'
+    template_name = 'form.html'
     success_url = reverse_lazy('gitweb:index')
     success_message = _('Repository edited.')