diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 3259e5b..db4c567 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -251,9 +251,9 @@ Template.main.events({
         if(e === "overlay") {
         	closeDivFade(document.getElementsByClassName("overlay")[0]);
         	if(!Session.get("newWork")) {
-        		Session.set("serverData",getHomeworkFormData())
-        		sendData("editWork");
-        	} else {
+        		if(getHomeworkFormData() === null) return;
+    			Session.set("serverData",Session.get("currentWork"));
+    			sendData("editWork");
         	}
         	Session.set("newWork",null);
         }