diff --git a/styles/components/_accordion_table.scss b/styles/components/_accordion_table.scss
index fbc44cbe..d9e740af 100644
--- a/styles/components/_accordion_table.scss
+++ b/styles/components/_accordion_table.scss
@@ -46,7 +46,6 @@
     margin: 0;
 
     li {
-      list-style-type: none;
       font-weight: $font-bold;
       border-bottom: 1px solid $color-gray-lightest;
       margin: 0;
diff --git a/templates/portfolios/applications/index.html b/templates/portfolios/applications/index.html
index 6683c83a..aa8740b7 100644
--- a/templates/portfolios/applications/index.html
+++ b/templates/portfolios/applications/index.html
@@ -55,15 +55,18 @@
                     <span>{{ "portfolios.applications.team_text" | translate }} ({{ application.members | length }})</span>
                   </a>
                   <div class='separator'></div>
-                  <a class='icon-link triangle-box' v-on:click="toggleSection('{{ section_name }}')">
+                  {% set has_environments = 0 < (application.environments|length) %}
+                  <a class='icon-link triangle-box' v-on:click="toggleSection('{{ section_name }}')" disabled="{{ not has_environments }}">
                     <span>Environments ({{ application.environments|length }})</span>
-                    <span v-if="selectedSection === '{{ section_name }}'">
-                      {{ Icon('caret_up') }}
-                    </span>
-                    <span v-else>
-                      {{ Icon('caret_down') }}
-                    </span>
-                    <div class="triangle-up" v-if="selectedSection === '{{ section_name }}'"></div>
+                    {% if has_environments %}
+                      <span v-if="selectedSection === '{{ section_name }}'">
+                        {{ Icon('caret_up') }}
+                      </span>
+                      <span v-else>
+                        {{ Icon('caret_down') }}
+                      </span>
+                      <div class="triangle-up" v-if="selectedSection === '{{ section_name }}'"></div>
+                    {% endif %}
                   </a>
                 </div>
               </div>