diff --git a/CUERipper/frmCUERipper.Designer.cs b/CUERipper/frmCUERipper.Designer.cs
index 753533f4..feccae34 100644
--- a/CUERipper/frmCUERipper.Designer.cs
+++ b/CUERipper/frmCUERipper.Designer.cs
@@ -647,6 +647,8 @@ private void InitializeComponent()
             this.listMetadata.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listMetadata_AfterLabelEdit);
             this.listMetadata.BeforeLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.listMetadata_BeforeLabelEdit);
             this.listMetadata.Click += new System.EventHandler(this.listMetadata_Click);
+            this.listMetadata.KeyDown += new System.Windows.Forms.KeyEventHandler(this.listMetadata_KeyDown);
+            this.listMetadata.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.listMetadata_PreviewKeyDown);
             // 
             // columnHeaderValue
             // 
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index 5cdc4777..e410d91a 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -1856,6 +1856,28 @@ private void bnComboBoxC2ErrorModeSetting_SelectedValueChanged(object sender, Ev
                 selectedDriveInfo.drive.DriveC2ErrorMode = (int)bnComboBoxC2ErrorModeSetting.SelectedItem;
             }
         }
+
+        private void listMetadata_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.F2)
+            {
+                listMetadata.FocusedItem.BeginEdit();
+            }
+        }
+
+        private void listMetadata_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (listMetadata.FocusedItem != null && listMetadata.FocusedItem.Index + 1 < listMetadata.Items.Count)// && e.Label != null)
+                {
+                    listMetadata.FocusedItem.Selected = false;
+                    listMetadata.FocusedItem = listMetadata.Items[listMetadata.FocusedItem.Index + 1];
+                    listMetadata.FocusedItem.Selected = true;
+                    listMetadata.FocusedItem.BeginEdit();
+                }
+            }
+        }
     }
 
     internal class BackgroundWorkerArtworkArgs