diff --git a/src/common/lookups/TalkgroupRulesLookup.h b/src/common/lookups/TalkgroupRulesLookup.h
index ba154351..d74a7333 100644
--- a/src/common/lookups/TalkgroupRulesLookup.h
+++ b/src/common/lookups/TalkgroupRulesLookup.h
@@ -473,7 +473,6 @@ namespace lookups
             node["source"] = source;
         }
 
-
     public:
         /**
          * @brief Textual name for the routing rule.
diff --git a/src/tged/TGEdMainWnd.h b/src/tged/TGEdMainWnd.h
index 8c9f5967..54254f14 100644
--- a/src/tged/TGEdMainWnd.h
+++ b/src/tged/TGEdMainWnd.h
@@ -8,7 +8,7 @@
  *
  */
 /**
- * @file TGEdainWnd.h
+ * @file TGEdMainWnd.h
  * @ingroup tged
  */
 #if !defined(__TGED_MAIN_WND_H__)
diff --git a/src/tged/TGEditWnd.h b/src/tged/TGEditWnd.h
index ea021217..f2ab7168 100644
--- a/src/tged/TGEditWnd.h
+++ b/src/tged/TGEditWnd.h
@@ -197,6 +197,10 @@ private:
                 }
 
                 m_tgId.setText(std::to_string(tgId));
+
+                auto source = m_rule.source();
+                source.tgId(tgId);
+                m_rule.source(source); 
                 redraw(); 
             });
             m_tgId.addCallback("down-pressed", [&]() {
@@ -207,6 +211,10 @@ private:
                 }
 
                 m_tgId.setText(std::to_string(tgId));
+
+                auto source = m_rule.source();
+                source.tgId(tgId);
+                m_rule.source(source); 
                 redraw();
             });
             m_tgId.addCallback("changed", [&]() { 
diff --git a/src/tged/TGListWnd.h b/src/tged/TGListWnd.h
index 6e0ed205..5dd2391c 100644
--- a/src/tged/TGListWnd.h
+++ b/src/tged/TGListWnd.h
@@ -90,6 +90,9 @@ public:
         m_selected = TalkgroupRuleGroupVoice();
         m_selectedTgId = 0U;
 
+        auto entry = g_tidLookups->groupVoice()[0U];
+        m_selected = entry;
+
         m_listView.clear();
         for (auto entry : g_tidLookups->groupVoice()) {
             // pad TGs properly