diff --git a/pkg/service/windowservice/windowservice.go b/pkg/service/windowservice/windowservice.go
index 883a5b670..6e1a9a2a8 100644
--- a/pkg/service/windowservice/windowservice.go
+++ b/pkg/service/windowservice/windowservice.go
@@ -76,6 +76,7 @@ func (svc *WindowService) CloseTab(ctx context.Context, uiContext waveobj.UICont
 	}
 	if window.ActiveTabId == tabId && tabIndex != -1 {
 		if len(ws.TabIds) == 1 {
+			svc.CloseWindow(ctx, uiContext.WindowId)
 			eventbus.SendEventToElectron(eventbus.WSEventType{
 				EventType: eventbus.WSEvent_ElectronCloseWindow,
 				Data:      uiContext.WindowId,