diff --git a/chirp/wxui/main.py b/chirp/wxui/main.py
index 0b28df8be..590d4a704 100644
--- a/chirp/wxui/main.py
+++ b/chirp/wxui/main.py
@@ -1471,7 +1471,7 @@ def fmt_lang(lang):
         try:
             current = wx.Locale.FindLanguageInfo(
                 CONF.get('force_language', 'prefs'))
-            initial = choices.index(fmt_lang(current.DescriptionNative))
+            initial = choices.index(fmt_lang(current))
         except TypeError:
             # Unset in the config (i.e. None)
             initial = 0
diff --git a/chirp/wxui/memedit.py b/chirp/wxui/memedit.py
index 3af747a7f..7e2f72c04 100644
--- a/chirp/wxui/memedit.py
+++ b/chirp/wxui/memedit.py
@@ -1844,7 +1844,7 @@ def _mem_properties(self, rows, event):
     @common.error_proof()
     def _mem_insert(self, row, event):
         # Traverse memories downward until we find a hole
-        for i in range(row, self.mem2row(self._features.memory_bounds[1] + 1)):
+        for i in range(row, self.mem2row(self._features.memory_bounds[1]) + 1):
             mem = self._memory_cache[i]
             if mem.empty:
                 LOG.debug("Found empty memory %i at row %i" % (mem.number, i))