diff --git a/Client/src/js/ttc/TTCCommon.js b/Client/src/js/ttc/TTCCommon.js
index a9467841fbfdeaffbc1e11dc884f1214d8ebae13..cc20fa4c549078265c7b262c23d5c47a005cc1c2 100644
--- a/Client/src/js/ttc/TTCCommon.js
+++ b/Client/src/js/ttc/TTCCommon.js
@@ -9,12 +9,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){
 	var changeTaskEvent = function () {
 			
 		var ct = this.findParentByType(itasks.ttc.FormContainer);
-		if (!ct)
-			ct = this.findParentByType(itasks.ttc.GroupContainer);
 		if (!ct)
 			ct = this.findParentByType(itasks.ttc.InstructionContainer);
 		if(!ct)
 			ct = this.findParentByType(itasks.ttc.MessageContainer);
+		if (!ct)
+			// if element is not inside form/instr/message it's a group's toolbar
+			ct = this.findParentByType(itasks.ttc.GroupContainer);
 		if(!ct) return;
 		
 		//Helper function to get the value of a checkbox group
@@ -43,12 +44,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){
 		if(this.clickCB) this.clickCB(this);
 		
 		var ct = this.findParentByType(itasks.ttc.FormContainer);
-		if (!ct)
-			ct = this.findParentByType(itasks.ttc.GroupContainer);
 		if (!ct)
 			ct = this.findParentByType(itasks.ttc.InstructionContainer);
 		if(!ct)
 			ct = this.findParentByType(itasks.ttc.MessageContainer);
+		// if element is not inside form/instr/message it's a group's toolbar
+		if (!ct)
+			ct = this.findParentByType(itasks.ttc.GroupContainer);
 		if(!ct) return;
 			
 		var taskId = (comp.taskId)? comp.taskId : ct.taskId
diff --git a/Client/src/static/skins/default/ttc.css b/Client/src/static/skins/default/ttc.css
index df0ffc0758503404ef50b9bbe429f43a26193373..a2b9c9229da667975de3cbe38edb313e8c21ac1e 100644
--- a/Client/src/static/skins/default/ttc.css
+++ b/Client/src/static/skins/default/ttc.css
@@ -43,10 +43,11 @@
 	display: none;
 }
 
-.GroupFixedNoFocus  .FormPanel,
+.GroupFixedNoFocus .FormPanel,
 .GroupFixedNoFocus .ProcessControlPanel,
 .GroupFixedNoFocus .InstructionContainer-Text,
-.GroupFixedNoFocus .InstructionContainer-Context {
+.GroupFixedNoFocus .InstructionContainer-Context,
+.GroupFixedNoFocus .MessagePanel {
 	background-image : url('img/ttc-icons/TTCBackgroundNoFocus.png') !important;
 	border-bottom:1px solid #ddd;
 	border-left:1px solid #ddd;
@@ -66,7 +67,8 @@
 .GroupFloating .FormPanel,
 .GroupFloating .ProcessControlPanel,
 .GroupFloating .InstructionContainer-Text,
-.GroupFloating .InstructionContainer-Context {
+.GroupFloating .InstructionContainer-Context,
+.GroupFloating .MessagePanel {
 	margin: 0px;
 	border: none;
 }