diff --git a/mamweb/templates/flatpages/default.html b/mamweb/templates/flatpages/default.html
index 9b25c2dd..aa651a59 100644
--- a/mamweb/templates/flatpages/default.html
+++ b/mamweb/templates/flatpages/default.html
@@ -16,6 +16,7 @@
 
 {# nahraj spravne submenu #}
 {% block submenu %}
+  {# co-je-MaM #}
   {% if "/co-je-MaM/" in flatpage.url %}
     {% if "/uvod/" in flatpage.url %}
       {% with "uvod" as selected %}
@@ -33,6 +34,7 @@
       {% include "seminar/cojemam/submenu.html" %}
     {% endif %}
   {% endif %}
+  {# soustredeni #}
   {% if "/soustredeni/" in flatpage.url %}
     {% if "/pripravujeme/" in flatpage.url %}
       {% with "pripravujeme" as selected %}
@@ -44,12 +46,29 @@
       {% endwith %}
     {% endif %}
   {% endif %}
+  {# zadani #}
   {% if "/zadani/" in flatpage.url %}
-    {% include "seminar/zadani/submenu.html" %}
+    {% if "/ulohy/" in flatpage.url %}
+      {% with "ulohy" as selected %}
+      {% include "seminar/zadani/submenu.html" %}
+      {% endwith %}
+    {% elif "aktualni-cislo" in flatpage.url %}
+      {% with "aktualni-cislo" as selected %}
+      {% include "seminar/zadani/submenu.html" %}
+      {% endwith %}
+    {% elif "vysledkove-listiny" in flatpage.url %}
+      {% with "vysledkove-listiny" as selected %}
+      {% include "seminar/zadani/submenu.html" %}
+      {% endwith %}
+    {% else %}
+      {% include "seminar/zadani/submenu.html" %}
+    {% endif %}
   {% endif %}
+  {# clanky #}
   {% if "/clanky/" in flatpage.url %}
     {% include "seminar/clanky/submenu.html" %}
   {% endif %}
+  {# archiv #}
   {% if "/archiv/" in flatpage.url %}
     {% include "seminar/archiv/submenu.html" %}
   {% endif %}
diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html
index 8ae89be1..2bda6387 100644
--- a/seminar/templates/seminar/zadani/AktualniZadani.html
+++ b/seminar/templates/seminar/zadani/AktualniZadani.html
@@ -1,5 +1,11 @@
 {% extends "seminar/zadani/base.html" %}
 
+{% block submenu %}
+  {% with "aktualni" as selected %}
+  {% include 'seminar/zadani/submenu.html' %}
+  {% endwith %}
+{% endblock submenu %}
+
 {% block content %}
 <div>
   <h2>
diff --git a/seminar/templates/seminar/zadani/Temata.html b/seminar/templates/seminar/zadani/Temata.html
index ca1c31b4..87aa8e33 100644
--- a/seminar/templates/seminar/zadani/Temata.html
+++ b/seminar/templates/seminar/zadani/Temata.html
@@ -1,5 +1,12 @@
 {% extends "seminar/zadani/base.html" %}
 
+{% block submenu %}
+  {% with "temata" as selected %}
+  {% include 'seminar/zadani/submenu.html' %}
+  {% endwith %}
+{% endblock submenu %}
+
+
 {% block content %}
 {% with nastaveni.aktualni_rocnik as ar %}
 <div>
diff --git a/seminar/templates/seminar/zadani/base.html b/seminar/templates/seminar/zadani/base.html
index ba4148aa..043fe401 100644
--- a/seminar/templates/seminar/zadani/base.html
+++ b/seminar/templates/seminar/zadani/base.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block menu_zadani %}selected{% endblock %}
+
 {% block submenu %}
   {% include 'seminar/zadani/submenu.html' %}
 {% endblock submenu %}
diff --git a/seminar/templates/seminar/zadani/submenu.html b/seminar/templates/seminar/zadani/submenu.html
index 92c10be5..1ff532ab 100644
--- a/seminar/templates/seminar/zadani/submenu.html
+++ b/seminar/templates/seminar/zadani/submenu.html
@@ -1,11 +1,11 @@
 {% with "/zadani" as cesta %}
 
 <ul>
-  <li><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
-  <li><a href="{{cesta}}/ulohy/">Úlohy</a>
-  <li><a href="{{cesta}}/temata/">Témata</a>
-  <li><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a>
-  <li><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a>
+  <li class="{% if selected == "aktualni" %}selected{% endif %}"><a href="{{cesta}}/aktualni/">Aktuální zadání</a>
+  <li class="{% if selected == "ulohy" %}selected{% endif %}"><a href="{{cesta}}/ulohy/">Úlohy</a>
+  <li class="{% if selected == "temata" %}selected{% endif %}"><a href="{{cesta}}/temata/">Témata</a>
+  <li class="{% if selected == "aktualni-cislo" %}selected{% endif %}"><a href="{{cesta}}/aktualni-cislo/">Aktuální číslo</a>
+  <li class="{% if selected == "vysledkove-listiny" %}selected{% endif %}"><a href="{{cesta}}/vysledkove-listiny/">Výsledkové listiny</a>
 </ul>
 
 {% endwith %}