diff --git a/configtool/displaypage.py b/configtool/displaypage.py
index 66aaf0f..d21aaea 100644
--- a/configtool/displaypage.py
+++ b/configtool/displaypage.py
@@ -3,7 +3,6 @@
 
 import wx
 from configtool.page import Page
-from configtool.data import pinNames
 
 
 class DisplayPage(wx.Panel, Page):
@@ -48,7 +47,7 @@ class DisplayPage(wx.Panel, Page):
     for k in ('DISPLAY_RS_PIN', 'DISPLAY_RW_PIN', 'DISPLAY_E_PIN',
               'DISPLAY_D4_PIN', 'DISPLAY_D5_PIN', 'DISPLAY_D6_PIN',
               'DISPLAY_D7_PIN'):
-      tc = self.addPinChoice(k, "", pinNames, True, 200)
+      tc = self.addPinChoice(k, 200)
       self.pinbox.Add(tc)
       self.pinbox.AddSpacer((5, 5))
     sz.Add(self.pinbox, pos = (3, 1))
diff --git a/configtool/page.py b/configtool/page.py
index 0af2603..272755f 100644
--- a/configtool/page.py
+++ b/configtool/page.py
@@ -2,7 +2,8 @@
 import wx
 
 from configtool.decoration import Decoration
-from configtool.data import reInteger, reFloat, offsetChLabel, offsetTcLabel
+from configtool.data import (reInteger, reFloat, offsetChLabel, offsetTcLabel,
+                             pinNames)
 
 
 class Page:
@@ -90,29 +91,19 @@ class Page:
 
     return lsz
 
-  def addPinChoice(self, name, choiceVal, pins, allowBlank , labelWidth):
+  def addPinChoice(self, name, labelWidth):
     lsz = wx.BoxSizer(wx.HORIZONTAL)
     st = wx.StaticText(self, wx.ID_ANY, self.labels[name],
                        size = (labelWidth, -1), style = wx.ALIGN_RIGHT)
     st.SetFont(self.font)
     lsz.Add(st, 1, wx.TOP, offsetChLabel)
 
-    if allowBlank:
-      opts = ["-"] + pins
-    else:
-      opts = pins
-
-    ch = wx.Choice(self, wx.ID_ANY, choices = opts, name = name,
-                   style = wx.CB_SORT)
+    ch = wx.Choice(self, wx.ID_ANY, name = name, style = wx.CB_SORT)
     ch.SetBackgroundColour(self.deco.getBackgroundColour())
     ch.SetFont(self.font)
+    ch.AppendItems(["-"] + pinNames)
     ch.Bind(wx.EVT_CHOICE, self.onChoice)
     self.choices[name] = ch
-    try:
-      sv = self.pinNames.index(choiceVal)
-    except:
-      sv = 0
-    ch.SetSelection(sv)
     lsz.Add(ch)
 
     return lsz
diff --git a/configtool/pinoutspage.py b/configtool/pinoutspage.py
index df56bc0..07b94d8 100644
--- a/configtool/pinoutspage.py
+++ b/configtool/pinoutspage.py
@@ -1,7 +1,6 @@
 
 import wx
 from configtool.page import Page
-from configtool.data import pinNames
 
 
 class PinoutsPage(wx.Panel, Page):
@@ -79,7 +78,7 @@ class PinoutsPage(wx.Panel, Page):
         tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlPin)
         sbox.Add(tc)
       elif ctype == 2:
-        tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+        tc = self.addPinChoice(k, labelWidth)
         sbox.Add(tc)
       else:
         cb = self.addCheckBox(k, self.onCheckBox)
@@ -98,7 +97,7 @@ class PinoutsPage(wx.Panel, Page):
         tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlPin)
         sbox.Add(tc)
       elif ctype == 2:
-        tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+        tc = self.addPinChoice(k, labelWidth)
         sbox.Add(tc)
       else:
         cb = self.addCheckBox(k, self.onCheckBox)
@@ -117,7 +116,7 @@ class PinoutsPage(wx.Panel, Page):
         tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlPin)
         sbox.Add(tc)
       elif ctype == 2:
-        tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+        tc = self.addPinChoice(k, labelWidth)
         sbox.Add(tc)
       else:
         cb = self.addCheckBox(k, self.onCheckBox)
@@ -136,7 +135,7 @@ class PinoutsPage(wx.Panel, Page):
         tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlPin)
         sbox.Add(tc)
       elif ctype == 2:
-        tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+        tc = self.addPinChoice(k, labelWidth)
         sbox.Add(tc)
       else:
         cb = self.addCheckBox(k, self.onCheckBox)
@@ -147,7 +146,7 @@ class PinoutsPage(wx.Panel, Page):
     sz.Add(sbox, pos = (1, 7))
 
     k = "STEPPER_ENABLE_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth + 20)
+    tc = self.addPinChoice(k, labelWidth + 20)
     sz.Add(tc, pos = (3, 1))
 
     sz.AddSpacer((10, 10), pos = (4, 1))
@@ -157,7 +156,7 @@ class PinoutsPage(wx.Panel, Page):
     sz.Add(cb, pos = (5, 1), flag = wx.ALIGN_CENTER_HORIZONTAL)
 
     k = "PS_ON_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+    tc = self.addPinChoice(k, labelWidth)
     sz.Add(tc, pos = (3, 3))
 
     k = "PS_INVERT_ON"
@@ -165,15 +164,15 @@ class PinoutsPage(wx.Panel, Page):
     sz.Add(cb, pos = (5, 3), flag = wx.ALIGN_CENTER_HORIZONTAL)
 
     k = "PS_MOSFET_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+    tc = self.addPinChoice(k, labelWidth)
     sz.Add(tc, pos = (7, 3))
 
     k = "SD_CARD_SELECT_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+    tc = self.addPinChoice(k, labelWidth)
     sz.Add(tc, pos = (3, 7))
 
     k = "DEBUG_LED_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+    tc = self.addPinChoice(k, labelWidth)
     sz.Add(tc, pos = (5, 7))
 
     self.SetSizer(sz)
diff --git a/configtool/sensorpage.py b/configtool/sensorpage.py
index 1598bdc..007a8b8 100644
--- a/configtool/sensorpage.py
+++ b/configtool/sensorpage.py
@@ -70,7 +70,7 @@ class SensorsPage(wx.Panel, Page):
     sz.Add(bsz, pos = (1, 3))
 
     k = "MCP3008_SELECT_PIN"
-    tc = self.addPinChoice(k, "", pinNames, True, labelWidth)
+    tc = self.addPinChoice(k, labelWidth)
     sz.Add(tc, pos = (2, 1))
 
     self.SetSizer(sz)