diff --git a/Modules/BuildList.lua b/Modules/BuildList.lua
index 50738dc7..de9dfd96 100644
--- a/Modules/BuildList.lua
+++ b/Modules/BuildList.lua
@@ -129,6 +129,9 @@ function listMode:EditInit(finFunc)
 end
 
 function listMode:EditFinish()
+	if not self.edit then
+		return
+	end
 	local msg = self.editFinFunc(self.controls.buildList.controls.nameEdit.buf)
 	if msg then
 		main:OpenMessagePopup("Message", msg)
@@ -164,22 +167,21 @@ function listMode:New()
 		end
 		outFile:write('<?xml version="1.0" encoding="UTF-8"?>\n<PathOfBuilding>\n</PathOfBuilding>')
 		outFile:close()
-		self.sel = 1
-		self.list[self.sel].fileName = fileName
-		self.list[self.sel].buildName = buf
+		self.list[self.edit].fileName = fileName
+		self.list[self.edit].buildName = buf
 		self:SortList()
 	end)
 end
 
 function listMode:LoadSel()
-	if not self.sel or not self.list[self.sel] then
+	if self.edit or not self.sel or not self.list[self.sel] then
 		return
 	end
 	main:SetMode("BUILD", main.buildPath..self.list[self.sel].fileName, self.list[self.sel].buildName)
 end
 
 function listMode:CopySel()
-	if not self.sel or not self.list[self.sel] then
+	if self.edit or not self.sel or not self.list[self.sel] then
 		return
 	end
 	local srcName = self.list[self.sel].fileName
@@ -207,14 +209,14 @@ function listMode:CopySel()
 		outFile:write(inFile:read("*a"))
 		inFile:close()
 		outFile:close()
-		self.list[self.sel].fileName = dstName
-		self.list[self.sel].buildName = buf
+		self.list[self.edit].fileName = dstName
+		self.list[self.edit].buildName = buf
 		self:SortList()
 	end)
 end
 
 function listMode:RenameSel()
-	if not self.sel or not self.list[self.sel] then
+	if self.edit or not self.sel or not self.list[self.sel] then
 		return
 	end
 	local oldName = self.list[self.sel].fileName
@@ -237,14 +239,14 @@ function listMode:RenameSel()
 		if not res then
 			return "Couldn't rename '"..oldName.."' to '"..newName.."': "..msg
 		end
-		self.list[self.sel].fileName = newName
-		self.list[self.sel].buildName = buf
+		self.list[self.edit].fileName = newName
+		self.list[self.edit].buildName = buf
 		self:SortList()
 	end)
 end
 
 function listMode:DeleteSel()
-	if not self.sel or not self.list[self.sel] then
+	if self.edit or not self.sel or not self.list[self.sel] then
 		return
 	end
 	main:OpenConfirmPopup("Confirm Delete", "Are you sure you want to delete build:\n"..self.list[self.sel].buildName.."\nThis cannot be undone.", "Delete", function()
diff --git a/manifest.xml b/manifest.xml
index 76db8ecb..5463b6e9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.0.2"/>
+	<Version number="1.0.3"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="61015c55ce37b065d24a70cf3f35ed3f66f5cb7b" name="Launch.lua" part="program"/>
@@ -34,7 +34,7 @@
 	<File sha1="5f28e18b2867769b6141109332f263e12c74b2f9" name="Classes/TreeTab.lua" part="program"/>
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="5002676f4d7b6ee38bf7d18feca5798123315af4" name="Modules/Build.lua" part="program"/>
-	<File sha1="ccd4efb6233b86e408459cf8cda67a60b2759e8a" name="Modules/BuildList.lua" part="program"/>
+	<File sha1="becdc9504f01dfcfee2c03dc8f5886f31a52d790" name="Modules/BuildList.lua" part="program"/>
 	<File sha1="e3bf122c9f98693639428848c72adb20147cf3bb" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="7721650215b51d7c472da2e81389b81c91c6b498" name="Modules/CalcsView.lua" part="program"/>
 	<File sha1="d594ac3a7c8fd823664891db1874b29666bf1915" name="Modules/Common.lua" part="program"/>