diff --git a/portlet/responsive/header/src/main/webapp/jsp/header.jsp b/portlet/responsive/header/src/main/webapp/jsp/header.jsp
index be7dcad8a..f001383ce 100644
--- a/portlet/responsive/header/src/main/webapp/jsp/header.jsp
+++ b/portlet/responsive/header/src/main/webapp/jsp/header.jsp
@@ -1,30 +1,31 @@
-<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
-<%@ page import="java.util.Locale" %>
-<%@ page import="java.util.ResourceBundle" %>
-<portlet:defineObjects/>
-<jsp:useBean id="header" class="org.gatein.portlet.responsive.header.HeaderBean"/>
+<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
+<%@ page import="java.util.Locale"%>
+<%@ page import="java.util.ResourceBundle"%>
+<portlet:defineObjects />
+<jsp:useBean id="header"
+	class="org.gatein.portlet.responsive.header.HeaderBean" />
 
 <%
-Locale locale = renderRequest.getLocale();
-ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale);
-
-String signinAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ShowLoginForm', true));" ;
-String registerAction = header.generateRegisterLink();
-String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));" ;
+   Locale locale = renderRequest.getLocale();
+			ResourceBundle resourceBundle = portletConfig
+					.getResourceBundle(locale);
 
+			String signinAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ShowLoginForm', true));";
+			String registerAction = header.generateRegisterLink();
+			String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'ChangeLanguage', true));";
 %>
 
 <div id="gtnResponsiveHeaderPortlet">
-  <div id="grh_logo"></div>
-  <div id="grh_icon" onclick="toggleOptions()" class="hidden"></div>
-  <div id="grh_options">
-     <ul>
-       <li><a onclick="<%= signinAction %>"><%= resourceBundle.getString("label.Signin") %></a></li>
-       <li><a href="<%=registerAction%>"><%= resourceBundle.getString("label.Register") %></a></li>
-       <li><a onclick="<%= changeLanguageAction %>"><%= resourceBundle.getString("label.ChangeLanguage") %></a></li>
-     </ul>
-  </div>
-  <div class="grh_clear"></div>
+	<div id="grh_logo"></div>
+	<div id="grh_icon" onclick="toggleOptions()" class="hidden"></div>
+	<div id="grh_options">
+		<ul>
+			<li><a onclick="<%=signinAction%>"><%=resourceBundle.getString("label.Signin")%></a></li>
+			<li><a href="<%=registerAction%>"><%=resourceBundle.getString("label.Register")%></a></li>
+			<li><a onclick="<%=changeLanguageAction%>"><%=resourceBundle.getString("label.ChangeLanguage")%></a></li>
+		</ul>
+	</div>
+	<div class="grh_clear"></div>
 </div>
 
 <script type="text/javascript">
@@ -40,6 +41,7 @@ String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) aj
 	var maxWidthForOptions = logoWidth + optionsWidth;
 	
 	var iconSelected = false;
+	var expanded = true;
 
 	checkGRHSize();
 	
@@ -47,15 +49,17 @@ String changeLanguageAction = "if(document.getElementById('UIMaskWorkspace')) aj
 	{
 		var mainWidth = GRHMainDiv.clientWidth;
 
-		if ((mainWidth - maxWidthForOptions) < 0) {
+		if (((mainWidth - maxWidthForOptions) < 0) && expanded == true) {
 			GRHOptionsDiv.className="hidden";
 			GRHIconDiv.className="visible";
+			expanded = false;
 		}
-		else
-		{
-			GRHOptionsDiv.className="visible";
-			GRHIconDiv.className="hidden";
-		}
+		else if (((mainWidth - maxWidthForOptions) >= 0) && expanded == false)
+			{
+				GRHOptionsDiv.className="visible";
+				GRHIconDiv.className="hidden";
+				expanded = true;
+			}
 	}