diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html
index 01626585ad..078dafb24f 100644
--- a/apps/common/templates/generic_list_subtemplate.html
+++ b/apps/common/templates/generic_list_subtemplate.html
@@ -27,26 +27,28 @@
 
         <form action="{% url multi_object_action_view %}" class="form" method="get">
 
-            {% if multi_select or multi_select_as_buttons %}
-                {% if multi_select_as_buttons %}
-                    {% get_multi_item_links as multi_item_links %}
-                    <div class="group navform wat-cf">
-                    {% for link in multi_item_links %}
-                        <button class="button" type="submit" name="action" value="{{ link.url }}">
-                           {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
-                        </button>
-                    {% endfor %}
-                    </div>
-                {% else %}
-                    {% with "true" as form_hide_required_text %}
-                        {% get_multi_item_links_form %}
-                    {% endwith %}
-                    <div class="group navform wat-cf">
-                        <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                            <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
-                        </button>
-                    </div>
-                {% endif %}
+            {% if object_list %}
+                {% if multi_select or multi_select_as_buttons %}
+                    {% if multi_select_as_buttons %}
+                        {% get_multi_item_links as multi_item_links %}
+                        <div class="group navform wat-cf">
+                        {% for link in multi_item_links %}
+                            <button class="button" type="submit" name="action" value="{{ link.url }}">
+                               {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
+                            </button>
+                        {% endfor %}
+                        </div>
+                    {% else %}
+                        {% with "true" as form_hide_required_text %}
+                            {% get_multi_item_links_form %}
+                        {% endwith %}
+                        <div class="group navform wat-cf">
+                            <button class="button" type="submit" name="{{ form.prefix }}-submit">
+                                <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
+                            </button>
+                        </div>
+                    {% endif %}
+                {% endif %}          
             {% endif %}          
         
             {% if scrollable_content %}
@@ -135,26 +137,28 @@
                 </div>            
             {% endif %}            
             
-            {% if multi_select or multi_select_as_buttons %}
-                {% if multi_select_as_buttons %}
-                    {% get_multi_item_links as multi_item_links %}
-                    <div class="group navform wat-cf">
-                    {% for link in multi_item_links %}
-                        <button class="button" type="submit" name="action" value="{{ link.url }}">
-                           {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
-                        </button>
-                    {% endfor %}
-                    </div>
-                {% else %}
-                    {% with "true" as form_hide_required_text %}
-                        {% get_multi_item_links_form %}
-                    {% endwith %}
-                    <div class="group navform wat-cf">
-                        <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                            <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
-                        </button>
-                    </div>
-                {% endif %}
+            {% if object_list %}
+                {% if multi_select or multi_select_as_buttons %}
+                    {% if multi_select_as_buttons %}
+                        {% get_multi_item_links as multi_item_links %}
+                        <div class="group navform wat-cf">
+                        {% for link in multi_item_links %}
+                            <button class="button" type="submit" name="action" value="{{ link.url }}">
+                               {% if link.famfam %}<span class="famfam active famfam-{{ link.famfam|default:'link' }}"></span>{% endif %}{{ link.text|capfirst }}
+                            </button>
+                        {% endfor %}
+                        </div>
+                    {% else %}
+                        {% with "true" as form_hide_required_text %}
+                            {% get_multi_item_links_form %}
+                        {% endwith %}
+                        <div class="group navform wat-cf">
+                            <button class="button" type="submit" name="{{ form.prefix }}-submit">
+                                <img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
+                            </button>
+                        </div>
+                    {% endif %}
+                {% endif %}  
             {% endif %}  
         </form>
         {% paginate %}