diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py
index b74eec4..cda4355 100644
--- a/curses/netentry_curses.py
+++ b/curses/netentry_curses.py
@@ -140,6 +140,10 @@ class AdvancedSettingsDialog(urwid.WidgetWrap):
            not self.global_dns_cb.get_state():
             self.set_net_prop('use_static_dns', True)
             self.set_net_prop('use_global_dns', False)
+            # Strip addressses before checking them in the daemon.
+            for i in [self.dns1, self.dns2,
+                      self.dns3,self.dns_dom, self.search_dom, self.dns_dom]:
+                i.set_edit_text(i.get_edit_text().strip())
             self.set_net_prop('dns_domain', noneToString(self.dns_dom_edit.get_edit_text()))
             self.set_net_prop("search_domain", noneToString(self.search_dom_edit.get_edit_text()))
             self.set_net_prop("dns1", noneToString(self.dns1.get_edit_text()))
diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py
index bf1eb74..d843705 100644
--- a/curses/prefs_curses.py
+++ b/curses/prefs_curses.py
@@ -326,6 +326,11 @@ class PrefsDialog(urwid.WidgetWrap):
         """ Pushes the selected settings to the daemon.
             This exact order is found in prefs.py"""
         daemon.SetUseGlobalDNS(self.global_dns_checkb.get_state())
+
+        for i in [self.dns1, self.dns2,
+                  self.dns3,self.dns_dom, self.search_dom, self.dns_dom]:
+            i.set_edit_text(i.get_edit_text().strip())
+
         daemon.SetGlobalDNS(self.dns1.get_edit_text(), self.dns2.get_edit_text(),
                             self.dns3.get_edit_text(), self.dns_dom.get_edit_text(),
                             self.search_dom.get_edit_text())