diff --git a/OpenNest/Controls/PlateView.cs b/OpenNest/Controls/PlateView.cs
index 54fd9bc..b554bf7 100644
--- a/OpenNest/Controls/PlateView.cs
+++ b/OpenNest/Controls/PlateView.cs
@@ -258,7 +258,7 @@ namespace OpenNest.Controls
         {
             base.OnMouseDoubleClick(e);
 
-            if (e.Button == MouseButtons.Middle)
+            if (e.Button == MouseButtons.Middle && SelectedParts.Count == 0)
                 ZoomToFit();
         }
 
@@ -270,6 +270,13 @@ namespace OpenNest.Controls
                     RemoveSelectedParts();
                     break;
 
+                case Keys.F:
+                    if ((ModifierKeys & Keys.Control) == 0)
+                        ZoomToFit();
+                    else
+                        base.OnKeyDown(e);
+                    break;
+
                 default:
                     base.OnKeyDown(e);
                     break;