diff --git a/src/main/java/io/github/dsheirer/source/tuner/TunerViewPanel.java b/src/main/java/io/github/dsheirer/source/tuner/TunerViewPanel.java
index 04208ccd..5283c106 100644
--- a/src/main/java/io/github/dsheirer/source/tuner/TunerViewPanel.java
+++ b/src/main/java/io/github/dsheirer/source/tuner/TunerViewPanel.java
@@ -85,9 +85,12 @@ public class TunerViewPanel extends JPanel
                 if(!event.getValueIsAdjusting())
                 {
                     int row = mTunerTable.getSelectedRow();
-                    int modelRow = mTunerTable.convertRowIndexToModel(row);
 
-                    mTunerEditor.setItem(mTunerModel.getTuner(modelRow));
+                    if(row >= 0)
+                    {
+                        int modelRow = mTunerTable.convertRowIndexToModel(row);
+                        mTunerEditor.setItem(mTunerModel.getTuner(modelRow));
+                    }
                 }
             }
         });