diff --git a/EduNetworkBuilder/IPAddressEntry.cs b/EduNetworkBuilder/IPAddressEntry.cs
index 3d9732d..6c50d24 100644
--- a/EduNetworkBuilder/IPAddressEntry.cs
+++ b/EduNetworkBuilder/IPAddressEntry.cs
@@ -21,6 +21,8 @@ namespace EduNetworkBuilder
         NetworkDevice ParentDevice = null;
         Point StartLocation = new Point (50,50);
 
+        NB_IPAddress SavedIPAddress = null;
+
 
         public IPAddressEntry(NB_IPAddress toEdit, NetworkDevice ToEdit, Form ParentForm, bool JustPinging=false)
         {
@@ -34,6 +36,7 @@ namespace EduNetworkBuilder
             ParentDevice = ToEdit;
             Network myNet = NB.GetNetwork();
             NB_IPAddress lastIP = myNet.RetrieveLastIP();
+            SavedIPAddress = new NB_IPAddress(toEdit);
             WhatToEdit = toEdit;
             string hostname = "";
             if (ToEdit != null)
@@ -182,6 +185,8 @@ namespace EduNetworkBuilder
 
         private void btnCancel_Click(object sender, EventArgs e)
         {
+            if(SavedIPAddress != null)
+                WhatToEdit.Reparse(SavedIPAddress.GetIPString, SavedIPAddress.GetMaskString, SavedIPAddress.GetGateway.ToIpString());
             UpdateFieldsFromAddress();
             WellDone = false;
             Close();