diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h
index 11a1be02a..8400f858b 100644
--- a/src/gui/components/cc.h
+++ b/src/gui/components/cc.h
@@ -511,7 +511,7 @@ class CComponentsHeader : public CComponentsForm
 		void setHeaderIcon(const char* icon_name);
 		void addHeaderButton(const std::string& button_name);
 		void removeHeaderButtons();
-		void setHeaderButtons(const int buttons){cch_buttons = buttons;};
+		void setHeaderDefaultButtons(const int buttons);
 		void initCCHeaderItems();
 };
 
@@ -522,6 +522,7 @@ class CComponentsWindow : public CComponentsForm
 		std::string ccw_caption;
 		const char* ccw_icon_name;
 		int ccw_start_y;
+		int ccw_buttons;
 
 		void initHeader();
 		void initCCWItems();
@@ -543,6 +544,7 @@ class CComponentsWindow : public CComponentsForm
 		void setWindowCaption(const std::string& text){ccw_caption = text;};
 		void setWindowCaption(neutrino_locale_t locale_text);
 		void setWindowIcon(const char* iconname){ccw_icon_name = iconname;};
+		void setWindowHeaderButtons(const int& buttons){ccw_buttons = buttons;};
 
 		int getStartY(); //y value for start of the area below header
 };
diff --git a/src/gui/components/cc_frm_header.cpp b/src/gui/components/cc_frm_header.cpp
index 440ffba39..72d3168c6 100644
--- a/src/gui/components/cc_frm_header.cpp
+++ b/src/gui/components/cc_frm_header.cpp
@@ -221,6 +221,13 @@ void CComponentsHeader::initCCHDefaultButtons()
 #endif
 }
 
+void CComponentsHeader::setHeaderDefaultButtons(const int buttons)
+{
+	cch_buttons = buttons;
+	v_cch_btn.clear();
+	initCCHDefaultButtons();
+}
+
 // calculate minimal width of icon form
 void CComponentsHeader::initCCButtonFormSize()
 {
diff --git a/src/gui/components/cc_frm_window.cpp b/src/gui/components/cc_frm_window.cpp
index 461847b24..6a46ade97 100644
--- a/src/gui/components/cc_frm_window.cpp
+++ b/src/gui/components/cc_frm_window.cpp
@@ -82,6 +82,7 @@ void CComponentsWindow::initVarWindow()
 	ccw_caption 	= "";
 	ccw_icon_name	= NULL;
 	ccw_start_y	= 0;
+	ccw_buttons	= 0; //no header buttons
 	
 	setShadowOnOff(true);
 }
@@ -109,6 +110,7 @@ void CComponentsWindow::initHeader()
 		ccw_head->setHeaderText(ccw_caption);
 		ccw_head->initCCHeaderItems();
 		ccw_start_y = ccw_head->getHeight();
+		ccw_head->setHeaderDefaultButtons(ccw_buttons);
 	}
 }