diff --git a/forecast.xml b/forecast.xml
index 427debd509..d7fd7d6fa0 100644
--- a/forecast.xml
+++ b/forecast.xml
@@ -92,29 +92,21 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="forecast_view_form"/>
             <field name="act_window" ref="act_forecast_form"/>
         </record>
+        <record model="ir.action.act_window.domain" id="act_forecast_form_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_forecast_form"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_forecast_form_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain">[('state', '=', 'draft')]</field>
+            <field name="act_window" ref="act_forecast_form"/>
+        </record>
         <menuitem parent="stock.menu_stock" sequence="50"
             action="act_forecast_form" id="menu_forecast_form"/>
 
-        <record model="ir.action.act_window" id="act_forecast_form_draft">
-            <field name="name">Draft Forecasts</field>
-            <field name="res_model">stock.forecast</field>
-        </record>
-        <record model="ir.action.act_window.view"
-                id="act_forecast_form_draft_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="forecast_view_tree"/>
-            <field name="act_window" ref="act_forecast_form_draft"/>
-        </record>
-        <record model="ir.action.act_window.view"
-            id="act_forecast_form_draft_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="forecast_view_form"/>
-            <field name="act_window" ref="act_forecast_form_draft"/>
-        </record>
-        <menuitem parent="menu_forecast_form"
-            action="act_forecast_form_draft" id="menu_forecast_form_draft"
-            sequence="20"/>
-
         <record model="ir.ui.view" id="forecast_line_view_form">
             <field name="model">stock.forecast.line</field>
             <field name="type">form</field>