diff --git a/ChangeLog.md b/ChangeLog.md
index 42b3686..7aa86b9 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,7 @@
 ## Unreleased changes
 
 - implemented manual saving
+- added a warning when changing master password
 
 ## 0.1.1
 
diff --git a/app/UI.hs b/app/UI.hs
index 60097ee..d38b463 100644
--- a/app/UI.hs
+++ b/app/UI.hs
@@ -94,9 +94,13 @@ viewEditMenu = menu "View/Edit Password"
 
 changeMasterPass :: S.StateT Status IO ()
 changeMasterPass = do
-  oldP <- S.gets $ view masterPass
-  newP <- req $ reqDefault getMasterPass oldP
-  S.modify $ set masterPass newP
+  req (confirm $
+    "\nWARNING: Changing your master password will change all of your saved passwords.\n" ++
+    "Are you sure you would like to proceed?") >>= flip when
+    (do
+      oldP <- S.gets $ view masterPass
+      newP <- req $ reqDefault getMasterPass oldP
+      S.modify $ set masterPass newP)
   mainMenu
 
 lockSession :: S.StateT Status IO ()