diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98596850..39165b34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* [Fixed] Fixes a bug where --encrypt or --decrypt without a target file would not work.
 * [Improved] Supports a config option for setting word wrap.
 
 ### 0.3.0 (May 24, 2012)
diff --git a/jrnl/jrnl.py b/jrnl/jrnl.py
index 59991150..63d1fcc7 100755
--- a/jrnl/jrnl.py
+++ b/jrnl/jrnl.py
@@ -63,7 +63,7 @@ def guess_mode(args, config):
     """Guesses the mode (compose, read or export) from the given arguments"""
     compose = True
     export = False
-    if args.json or args.decrypt or args.encrypt or args.markdown or args.tags:
+    if args.json or args.decrypt is not False or args.encrypt is not False or args.markdown or args.tags:
         compose = False
         export = True
     elif args.start_date or args.end_date or args.limit or args.strict or args.short: