diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
index da0868f9d..8aec81107 100644
--- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
+++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
@@ -26,6 +26,7 @@
         <intercept-url pattern="/callback/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/zkau/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/common/layout/login.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+        <intercept-url pattern="/common/layout/timeout.zul" access="IS_AUTHENTICATED_ANONYMOUSLY" />
         <intercept-url pattern="/advance/**" access="ROLE_ADMINISTRATION" />
         <intercept-url pattern="/resources/criterions/**" access="ROLE_ADMINISTRATION"/>
         <intercept-url pattern="/calendars/**" access="ROLE_ADMINISTRATION" />
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
index 2507091b6..4a26d9983 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
@@ -65,6 +65,12 @@ table {
     border: solid 1px red;
 }
 
+.warningbox {
+    margin: 40px;
+    padding: 40px;
+    border: solid 1px #FDBE13;
+}
+
 /* --- START -- Buttons styles ---
 =================================================== */
 
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul b/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul
new file mode 100644
index 000000000..0743bbb84
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/common/layout/timeout.zul
@@ -0,0 +1,32 @@
+<!--
+  This file is part of NavalPlan
+
+  Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
+                     Desenvolvemento Tecnolóxico de Galicia
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_v01.css"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro_zk.css"?>
+<zk>
+    <window self="@{define(content)}" >
+        <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent" sclass="warningbox">
+            <i18n id="message" value="${i18n:_('Your session has expired after inactivity period. Please log in again.')}" />
+            <hbox style="margin-left:auto; margin-right:auto">
+                <button id="quitSession" label="${i18n:_('Back to log in')}"></button>
+            </hbox>
+        </vbox>
+    </window>
+</zk>