diff --git a/recipes/templates/recipe-form.html b/recipes/templates/recipe-form.html
index 0d3de9f..0fe7ccd 100644
--- a/recipes/templates/recipe-form.html
+++ b/recipes/templates/recipe-form.html
@@ -17,7 +17,7 @@
 	This program comes with a copy of the GNU Affero General Public License
 	file at the root of this project.
 {% endcomment %}
-{% block title %}{{ recipe.title }}{% endblock %}
+{% block title %}{{ title }}{% endblock %}
 {% block main %}
 <form action="" method="post" id="version-form">
 	{%csrf_token %}
diff --git a/recipes/templates/version.html b/recipes/templates/version.html
index bac7ea6..8e15ac7 100644
--- a/recipes/templates/version.html
+++ b/recipes/templates/version.html
@@ -17,7 +17,7 @@
 	This program comes with a copy of the GNU Affero General Public License
 	file at the root of this project.
 {% endcomment %}
-{% block title %}{{ recipe.title }}{% endblock %}
+{% block title %}{{ version.recipe.title }}{% if has_multiple_versions %} ({{ version.label }}){% endif %}{% endblock %}
 {% block main %}
 <h1>{{ version.recipe.title }}{% if has_multiple_versions %} ({{ version.label }}){% endif %}</h1>
 {% if has_multiple_versions %}
diff --git a/recipes/views.py b/recipes/views.py
index 146b32e..2efaf1f 100644
--- a/recipes/views.py
+++ b/recipes/views.py
@@ -85,7 +85,7 @@ def add_recipe(request):
 		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
 
-	return render(request, 'recipe-form.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset, 'title': 'Add recipe'})
 
 @login_required
 def edit_recipe(request, slug):
@@ -135,7 +135,7 @@ def add_version(request, slug):
 		version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
 
-	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset, 'title': f'Add version to {recipe.title}'})
 
 @login_required
 def edit_version(request, slug_recipe, slug_version):
@@ -164,4 +164,4 @@ def edit_version(request, slug_recipe, slug_version):
 		version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=get_name_of_user(request.user))
 		ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
 
-	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
+	return render(request, 'recipe-form.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset, 'title': f'Edit {recipe.title} ({version.label})'})