diff --git a/app/gui/src/main/scala/org/bitcoins/gui/AppMenuBar.scala b/app/gui/src/main/scala/org/bitcoins/gui/AppMenuBar.scala
index 7191971f5b..d5cae3f3eb 100644
--- a/app/gui/src/main/scala/org/bitcoins/gui/AppMenuBar.scala
+++ b/app/gui/src/main/scala/org/bitcoins/gui/AppMenuBar.scala
@@ -34,10 +34,14 @@ private class FileMenu() {
         initialDirectory = new File(Properties.userHome)
         initialFileName = "bitcoin-s-backup.zip"
       }
-      val chosenFile = fileChooser.showSaveDialog(null)
-      ConsoleCli.exec(ZipDataDir(chosenFile.toPath),
-                      GlobalData.consoleCliConfig)
-      ()
+      val chosenFileOpt = Option(fileChooser.showSaveDialog(null))
+      chosenFileOpt match {
+        case Some(chosenFile) =>
+          ConsoleCli.exec(ZipDataDir(chosenFile.toPath),
+                          GlobalData.consoleCliConfig)
+          ()
+        case None => // User canceled in dialog
+      }
     }
   }
 
diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPane.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPane.scala
index 39349549ba..c3f33dcece 100644
--- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPane.scala
+++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCPane.scala
@@ -124,9 +124,13 @@ class DLCPane(glassPane: VBox)(implicit ec: ExecutionContext) {
         selectedExtensionFilter = txtExtensionFilter
         initialDirectory = new File(Properties.userHome)
       }
-      val chosenFile = fileChooser.showSaveDialog(null)
-      Files.write(chosenFile.toPath, resultTextArea.text.value.getBytes)
-      ()
+      val chosenFileOpt = Option(fileChooser.showSaveDialog(null))
+      chosenFileOpt match {
+        case Some(chosenFile) =>
+          Files.write(chosenFile.toPath, resultTextArea.text.value.getBytes)
+          ()
+        case None => // User canceled in dialog
+      }
     }
   }