diff --git a/khal/controllers.py b/khal/controllers.py
index 1fc2200a2..9b2b7805e 100644
--- a/khal/controllers.py
+++ b/khal/controllers.py
@@ -580,6 +580,9 @@ def edit_event(event, collection, locale, allow_quit=False, width=80):
             value = prompt("datetime range", default=current)
             try:
                 start, end, allday = parse_datetime.guessrangefstr(ansi.sub("", value), locale)
+                if not allday:
+                    start = locale["local_timezone"].localize(start)
+                    end = locale["local_timezone"].localize(end)
                 event.update_start_end(start, end)
                 edited = True
             except Exception: