diff --git a/tdt4140-gr1800/app.ui/src/main/java/tdt4140/gr1800/app/ui/FileMenuController.java b/tdt4140-gr1800/app.ui/src/main/java/tdt4140/gr1800/app/ui/FileMenuController.java
index e7566ea1b6288baf620f609be92f57361fe51cfe..9eb8409bd6d79ea7f9a9eba6c405d788f60864fb 100644
--- a/tdt4140-gr1800/app.ui/src/main/java/tdt4140/gr1800/app/ui/FileMenuController.java
+++ b/tdt4140-gr1800/app.ui/src/main/java/tdt4140/gr1800/app/ui/FileMenuController.java
@@ -81,10 +81,14 @@ public class FileMenuController {
 	
 	@FXML
 	public void handleSaveAction() {
-		try {
-			documentStorage.saveDocument();
-		} catch (IOException e) {
-			// TODO
+		if (documentStorage.getDocumentLocation() == null) {
+			handleSaveAsAction();
+		} else {
+			try {
+				documentStorage.saveDocument();
+			} catch (IOException e) {
+				// TODO
+			}
 		}
 	}