diff --git a/ShareX.ScreenCaptureLib/Forms/SurfaceForm.cs b/ShareX.ScreenCaptureLib/Forms/SurfaceForm.cs
index 698ed082f..518cccf92 100644
--- a/ShareX.ScreenCaptureLib/Forms/SurfaceForm.cs
+++ b/ShareX.ScreenCaptureLib/Forms/SurfaceForm.cs
@@ -181,9 +181,6 @@ private void Surface_KeyUp(object sender, KeyEventArgs e)
                 case Keys.Escape:
                     Close(SurfaceResult.Close);
                     break;
-                case Keys.Space:
-                    Close(SurfaceResult.Fullscreen);
-                    break;
                 case Keys.Enter:
                     Close(SurfaceResult.Region);
                     break;
diff --git a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
index 500123071..5047a8fce 100644
--- a/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
+++ b/ShareX.ScreenCaptureLib/RegionHelpers/AreaManager.cs
@@ -164,6 +164,13 @@ public AreaManager(RectangleRegionForm surface)
         private void CreateShapeMenu()
         {
             cmsShapeMenu = new ContextMenuStrip();
+            cmsShapeMenu.KeyDown += (sender, e) =>
+            {
+                if (e.KeyCode == Keys.Space)
+                {
+                    cmsShapeMenu.Close();
+                }
+            };
 
             foreach (ShapeType shapeType in Helpers.GetEnums<ShapeType>())
             {
@@ -234,6 +241,12 @@ private void CreateShapeMenu()
 
             cmsShapeMenu.Items.Add(new ToolStripSeparator());
 
+            ToolStripMenuItem tsmiFullscreenCapture = new ToolStripMenuItem("Capture fullscreen");
+            tsmiFullscreenCapture.Click += (sender, e) => surface.Close(SurfaceResult.Fullscreen);
+            cmsShapeMenu.Items.Add(tsmiFullscreenCapture);
+
+            cmsShapeMenu.Items.Add(new ToolStripSeparator());
+
             ToolStripMenuItem tsmiCloseMenu = new ToolStripMenuItem("Close");
             tsmiCloseMenu.Click += (sender, e) => cmsShapeMenu.Close();
             cmsShapeMenu.Items.Add(tsmiCloseMenu);
@@ -328,6 +341,9 @@ private void surface_KeyDown(object sender, KeyEventArgs e)
                             break;
                     }
                     break;
+                case Keys.Space:
+                    cmsShapeMenu.Show(Cursor.Position.X, Cursor.Position.Y);
+                    break;
             }
         }
 
@@ -522,10 +538,6 @@ private void surface_MouseUp(object sender, MouseEventArgs e)
                     EndRegionSelection();
                 }
             }
-            else if (e.Button == MouseButtons.Middle)
-            {
-                cmsShapeMenu.Show(surface, e.Location);
-            }
         }
 
         private void RegionSelection(Point location)