diff --git a/base/templatetags/menus.py b/base/templatetags/menus.py
index 96bdc9e5a..6591823b6 100644
--- a/base/templatetags/menus.py
+++ b/base/templatetags/menus.py
@@ -27,6 +27,10 @@ def subnav(context, path=None):
     if root_pk:
         request = context['request']
         app = request.resolver_match.app_name
+        # Esse IF elimina o bug do subnav em Tabelas Auxiliares
+        # e também em proposições
+        if request.path.find(app) == -1:
+            return
         default_path = '%s/subnav.yaml' % app
         path = os.path.join(TEMPLATES_DIR, path or default_path)
         if os.path.exists(path):
diff --git a/materia/migrations/0036_merge.py b/materia/migrations/0036_merge.py
new file mode 100644
index 000000000..f0a9f86a6
--- /dev/null
+++ b/materia/migrations/0036_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-19 13:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0032_auto_20160503_0926'),
+        ('materia', '0035_auto_20160510_0949'),
+    ]
+
+    operations = [
+    ]