diff --git a/MyPluginControl.cs b/MyPluginControl.cs
index c294965..90d0d93 100644
--- a/MyPluginControl.cs
+++ b/MyPluginControl.cs
@@ -900,6 +900,11 @@ private void dataGridView1_DataError(object sender, DataGridViewDataErrorEventAr
                 MessageBox.Show($"Error in column '{column.Name}' at row {e.RowIndex + 1}. Value '{value}' is not valid.");
             }
         }
+        private void dataGridViewMapping_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+        {
+            if (new[] { 2, 4, 5 }.Contains(dataGridViewMapping.CurrentCell.ColumnIndex) && e.Control is ComboBox combo)
+                combo.DropDownStyle = ComboBoxStyle.DropDown;
+        }
 
         #endregion Data Grid
 
diff --git a/MyPluginControl.designer.cs b/MyPluginControl.designer.cs
index e2a3435..d1dcd02 100644
--- a/MyPluginControl.designer.cs
+++ b/MyPluginControl.designer.cs
@@ -227,6 +227,7 @@ private void InitializeComponent()
             // 
             // toggleInstructions
             // 
+            this.toggleInstructions.BackColor = System.Drawing.Color.NavajoWhite;
             this.toggleInstructions.Name = "toggleInstructions";
             this.toggleInstructions.Size = new System.Drawing.Size(145, 33);
             this.toggleInstructions.Text = "Hide instructions";
@@ -484,6 +485,7 @@ private void InitializeComponent()
             this.settingsEntity.Sorted = true;
             this.settingsEntity.TabIndex = 1;
             this.settingsEntity.DropDownClosed += new System.EventHandler(this.settingsEntity_DropDownClosed);
+            this.settingsEntity.DropDownStyle = ComboBoxStyle.DropDown;
             // 
             // settingsOptionSetValuesOrLabel
             // 
@@ -574,6 +576,7 @@ private void InitializeComponent()
             this.dataGridViewMapping.Size = new System.Drawing.Size(1110, 709);
             this.dataGridViewMapping.TabIndex = 1;
             this.dataGridViewMapping.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView1_DataError);
+            this.dataGridViewMapping.EditingControlShowing += dataGridViewMapping_EditingControlShowing;
             // 
             // ExcelColumn
             //