diff --git a/app/templates/views/templates/_move_to.html b/app/templates/views/templates/_move_to.html
index 7da4a2a05..4b9564c3d 100644
--- a/app/templates/views/templates/_move_to.html
+++ b/app/templates/views/templates/_move_to.html
@@ -1,7 +1,7 @@
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
 
-{% if templates_and_folders_form.move_to.choices %}
+{% if templates_and_folders_form.move_to.choices and (templates or template_folders) %}
   {{ radios(templates_and_folders_form.move_to) }}
   {{ page_footer('Move selected', button_name='operation', button_value='move') }}
 {% endif %}
diff --git a/app/templates/views/templates/choose.html b/app/templates/views/templates/choose.html
index 7d170dfd3..952d7ef7a 100644
--- a/app/templates/views/templates/choose.html
+++ b/app/templates/views/templates/choose.html
@@ -82,7 +82,7 @@
         {% with templates=templates, template_folders=template_folders %}
           {% include 'views/templates/_template_list.html' %}
         {% endwith %}
-        {% with templates_and_folders_form=templates_and_folders_form %}
+        {% with templates=templates, template_folders=template_folders, templates_and_folders_form=templates_and_folders_form %}
           {% include 'views/templates/_move_to.html' %}
         {% endwith %}
       </form>