diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
index d4690b7..2dec836 100644
--- a/src/Hy3Layout.cpp
+++ b/src/Hy3Layout.cpp
@@ -116,6 +116,7 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 	double tab_height_offset = *gaps_in * 2 + *tab_bar_height;
 
 	if (this->data.type != Hy3NodeData::Group) {
+		this->data.as_window->setHidden(this->hidden);
 		this->layout->applyNodeDataToWindow(this, force);
 		return;
 	}
@@ -130,10 +131,6 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 			errorNotif();
 		}
 
-		if (child->data.type == Hy3NodeData::Window) {
-			child->data.as_window->setHidden(false);
-		}
-
 		double distort_out;
 		double distort_in;
 
@@ -168,6 +165,8 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 			break;
 		}
 
+		child->setHidden(this->hidden);
+
 		this->updateTabBar();
 
 		child->recalcSizePosRecursive(force);
@@ -194,8 +193,6 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 		group->focused_child->setHidden(false);
 	}
 
-	bool hid_focused = false;
-
 	for(auto* child: group->children) {
 		switch (group->layout) {
 		case Hy3GroupLayout::SplitH:
@@ -204,7 +201,7 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 			offset += child->size.x;
 			child->position.y = this->position.y;
 			child->size.y = this->size.y;
-			child->setHidden(false);
+			child->setHidden(this->hidden);
 			child->recalcSizePosRecursive(force);
 			break;
 		case Hy3GroupLayout::SplitV:
@@ -213,7 +210,7 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 			offset += child->size.y;
 			child->position.x = this->position.x;
 			child->size.x = this->size.x;
-			child->setHidden(false);
+			child->setHidden(this->hidden);
 			child->recalcSizePosRecursive(force);
 			break;
 		case Hy3GroupLayout::Tabbed:
@@ -221,11 +218,9 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 			child->size.y = this->size.y - tab_height_offset;
 			child->position.x = this->position.x;
 			child->size.x = this->size.x;
-			bool hidden = group->focused_child != child;
-			Debug::log(LOG, "set %p hidden: %d", child, hidden);
-			if (child->isIndirectlyFocused()) hid_focused = true;
+			bool hidden = this->hidden || group->focused_child != child;
 			child->setHidden(hidden);
-			if (!hidden) child->recalcSizePosRecursive(force);
+			child->recalcSizePosRecursive(force);
 			break;
     }
   }
@@ -234,11 +229,9 @@ void Hy3Node::recalcSizePosRecursive(bool force) {
 }
 
 void Hy3Node::setHidden(bool hidden) {
-	switch (this->data.type) {
-	case Hy3NodeData::Window:
-		this->data.as_window->setHidden(hidden);
-		break;
-	case Hy3NodeData::Group:
+	this->hidden = hidden;
+
+	if (this->data.type == Hy3NodeData::Group) {
 		for (auto* child: this->data.as_group.children) {
 			child->setHidden(hidden);
 		}
@@ -1587,7 +1580,8 @@ void Hy3Layout::renderHook(void*, std::any data) {
 		if (!rendering_normally) break;
 
 		for (auto& entry: g_Hy3Layout->tab_groups) {
-			if (entry.target_window == g_pHyprOpenGL->m_pCurrentWindow
+			if (!entry.hidden
+					&& entry.target_window == g_pHyprOpenGL->m_pCurrentWindow
 					&& std::find(rendered_groups.begin(), rendered_groups.end(), &entry) == rendered_groups.end()
 			) {
 				entry.renderTabBar();
@@ -1600,7 +1594,8 @@ void Hy3Layout::renderHook(void*, std::any data) {
 		rendering_normally = false;
 
 		for (auto& entry: g_Hy3Layout->tab_groups) {
-			if (entry.target_window->m_iMonitorID == g_pHyprOpenGL->m_RenderData.pMonitor->ID
+			if (!entry.hidden
+					&& entry.target_window->m_iMonitorID == g_pHyprOpenGL->m_RenderData.pMonitor->ID
 					&& std::find(rendered_groups.begin(), rendered_groups.end(), &entry) == rendered_groups.end()
 			) {
 				entry.renderTabBar();
diff --git a/src/Hy3Layout.hpp b/src/Hy3Layout.hpp
index 515875a..a373fab 100644
--- a/src/Hy3Layout.hpp
+++ b/src/Hy3Layout.hpp
@@ -71,6 +71,7 @@ struct Hy3Node {
 	Vector2D size;
 	float size_ratio = 1.0;
 	int workspace_id = -1;
+	bool hidden = false;
 	bool valid = true;
 	Hy3Layout* layout = nullptr;
 
diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
index e3f2dc0..4201269 100644
--- a/src/TabGroup.cpp
+++ b/src/TabGroup.cpp
@@ -272,6 +272,7 @@ void Hy3TabGroup::updateWithGroup(Hy3Node& node) {
 	auto tpos = node.position + Vector2D(*gaps_in, *gaps_in);
 	auto tsize = Vector2D(node.size.x - *gaps_in * 2, *bar_height);
 
+	this->hidden = node.hidden;
 	if (this->pos.goalv() != tpos) this->pos = tpos;
 	if (this->size.goalv() != tsize) this->size = tsize;
 
diff --git a/src/TabGroup.hpp b/src/TabGroup.hpp
index fd8e0c9..7e43e95 100644
--- a/src/TabGroup.hpp
+++ b/src/TabGroup.hpp
@@ -65,6 +65,7 @@ class Hy3TabGroup {
 public:
 	CWindow* target_window = nullptr;
 	int workspace_id = -1;
+	bool hidden = false;
 	Hy3TabBar bar;
 	CAnimatedVariable pos;
 	CAnimatedVariable size;