diff --git a/src/components/IssueDetails.vue b/src/components/IssueDetails.vue
index 8ff4313..1d32d93 100644
--- a/src/components/IssueDetails.vue
+++ b/src/components/IssueDetails.vue
@@ -142,14 +142,10 @@ defineExpose({
             <v-btn rounded="0" prepend-icon="mdi-history" value="history">History</v-btn>
           </v-btn-toggle>
 
-          <v-tabs-window v-model="activity" class="activity__window">
-            <v-tabs-window-item value="comment" class="h-100">
-              <comments-list :issue-id="issue.id" />
-            </v-tabs-window-item>
-            <v-tabs-window-item value="history">
-              <history-list />
-            </v-tabs-window-item>
-          </v-tabs-window>
+          <div class="activity__window">
+            <comments-list v-if="activity === 'comment'" :issue-id="issue.id" class="h-100" />
+            <history-list v-else-if="activity === 'history'" />
+          </div>
         </v-sheet>
       </expansion-panel>
     </div>
@@ -198,10 +194,6 @@ defineExpose({
   &__window {
     flex: 1;
     min-height: 0;
-
-    :deep(.v-window__container) {
-      height: 100%;
-    }
   }
 }