Index: Core/Common/src/Core.Common.Controls/Forms/EnhancedButton.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Forms/EnhancedButton.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Forms/EnhancedButton.cs	(revision 0b486f2d9e94607ca10a9669fece160b9c05cd4e)
@@ -0,0 +1,55 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Windows.Forms;
+
+namespace Core.Common.Controls.Forms
+{
+    /// <summary>
+    /// Button that also responds to clicks when its containing form does not have input focus.
+    /// </summary>
+    public class EnhancedButton : Button
+    {
+        const uint WM_LBUTTONDOWN = 0x201;
+        const uint WM_LBUTTONUP = 0x202;
+
+        protected override void WndProc(ref Message message)
+        {
+            if (message.Msg == WM_LBUTTONUP)
+            {
+                SimulateMouseClick(ref message);
+            }
+            else
+            {
+                base.WndProc(ref message);
+            }
+        }
+
+        private void SimulateMouseClick(ref Message m)
+        {
+            m.Msg = (int) WM_LBUTTONDOWN;
+            base.WndProc(ref m);
+
+            m.Msg = (int) WM_LBUTTONUP;
+            base.WndProc(ref m);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj
===================================================================
diff -u -rfdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9 -r0b486f2d9e94607ca10a9669fece160b9c05cd4e
--- Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision fdcad55802f3fc8091d69f70c6aa1a16a0ffc2f9)
+++ Core/Common/test/Core.Common.Controls.Test/Core.Common.Controls.Test.csproj	(.../Core.Common.Controls.Test.csproj)	(revision 0b486f2d9e94607ca10a9669fece160b9c05cd4e)
@@ -15,10 +15,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj"/>
-    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj"/>
-    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj"/>
+    <ProjectReference Include="..\..\src\Core.Common.Base\Core.Common.Base.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Controls\Core.Common.Controls.csproj" />
+    <ProjectReference Include="..\..\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
Index: Core/Common/test/Core.Common.Controls.Test/Forms/EnhancedButtonTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Controls.Test/Forms/EnhancedButtonTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Controls.Test/Forms/EnhancedButtonTest.cs	(revision 0b486f2d9e94607ca10a9669fece160b9c05cd4e)
@@ -0,0 +1,39 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU 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 General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Windows.Forms;
+using Core.Common.Controls.Forms;
+using NUnit.Framework;
+
+namespace Core.Common.Controls.Test.Forms
+{
+    [TestFixture]
+    public class EnhancedButtonTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            var button = new EnhancedButton();
+
+            Assert.IsInstanceOf<Button>(button);
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs
===================================================================
diff -u -r4ce9677133435e95e10445e794ae49de7c4879e6 -r0b486f2d9e94607ca10a9669fece160b9c05cd4e
--- Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs	(.../CalculationsView.Designer.cs)	(revision 4ce9677133435e95e10445e794ae49de7c4879e6)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Views/CalculationsView.Designer.cs	(.../CalculationsView.Designer.cs)	(revision 0b486f2d9e94607ca10a9669fece160b9c05cd4e)
@@ -40,10 +40,10 @@
             this.listBox = new System.Windows.Forms.ListBox();
             this.sectionsLabel = new System.Windows.Forms.Label();
             this.dataGridTableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
+            this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
             this.calculationsLabel = new System.Windows.Forms.Label();
             this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.generateButton = new System.Windows.Forms.Button();
-            this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl();
+            this.generateButton = new Core.Common.Controls.Forms.EnhancedButton();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
             this.splitContainer.Panel1.SuspendLayout();
             this.splitContainer.Panel2.SuspendLayout();
@@ -103,6 +103,16 @@
             this.dataGridTableLayoutPanel.Size = new System.Drawing.Size(1089, 585);
             this.dataGridTableLayoutPanel.TabIndex = 1;
             // 
+            // dataGridViewControl
+            // 
+            this.dataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridViewControl.Location = new System.Drawing.Point(3, 3);
+            this.dataGridViewControl.MultiSelect = true;
+            this.dataGridViewControl.Name = "dataGridViewControl";
+            this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
+            this.dataGridViewControl.Size = new System.Drawing.Size(1083, 579);
+            this.dataGridViewControl.TabIndex = 0;
+            // 
             // calculationsLabel
             // 
             this.calculationsLabel.AutoSize = true;
@@ -139,16 +149,6 @@
             this.generateButton.UseVisualStyleBackColor = true;
             this.generateButton.Click += new System.EventHandler(this.generateButton_Click);
             // 
-            // dataGridViewControl
-            // 
-            this.dataGridViewControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridViewControl.Location = new System.Drawing.Point(3, 3);
-            this.dataGridViewControl.MultiSelect = true;
-            this.dataGridViewControl.Name = "dataGridViewControl";
-            this.dataGridViewControl.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.RowHeaderSelect;
-            this.dataGridViewControl.Size = new System.Drawing.Size(1083, 579);
-            this.dataGridViewControl.TabIndex = 0;
-            // 
             // CalculationsView
             // 
             this.Controls.Add(this.tableLayoutPanel);
@@ -175,14 +175,14 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
         private System.Windows.Forms.TableLayoutPanel dataGridTableLayoutPanel;
         private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl;
-        private System.Windows.Forms.Button generateButton;
+        private Core.Common.Controls.Forms.EnhancedButton generateButton;
 
         protected System.Windows.Forms.TableLayoutPanel DataGridTableLayoutPanel
         {
             get => this.dataGridTableLayoutPanel;
         }
 
-        protected System.Windows.Forms.Button GenerateButton
+        protected Core.Common.Controls.Forms.EnhancedButton GenerateButton
         {
             get => this.generateButton;
         }