diff --git a/app/src/main/java/com/simplemobiletools/calendar/EventsAdapter.java b/app/src/main/java/com/simplemobiletools/calendar/EventsAdapter.java
index 71fc10cc0..1ff6be162 100644
--- a/app/src/main/java/com/simplemobiletools/calendar/EventsAdapter.java
+++ b/app/src/main/java/com/simplemobiletools/calendar/EventsAdapter.java
@@ -37,7 +37,12 @@ public class EventsAdapter extends BaseAdapter {
         final Event event = mEvents.get(position);
         viewHolder.eventTitle.setText(event.getTitle());
         viewHolder.eventStart.setText(Formatter.getTime(event.getStartTS()));
-        viewHolder.eventEnd.setText(Formatter.getTime(event.getEndTS()));
+
+        if (event.getStartTS() == event.getEndTS()) {
+            viewHolder.eventEnd.setVisibility(View.INVISIBLE);
+        } else {
+            viewHolder.eventEnd.setText(Formatter.getTime(event.getEndTS()));
+        }
 
         return convertView;
     }
diff --git a/app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java b/app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java
index 45eeb260d..6455a6e46 100644
--- a/app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java
+++ b/app/src/main/java/com/simplemobiletools/calendar/activities/EventActivity.java
@@ -47,6 +47,8 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
     private static DateTime mEventEndDateTime;
     private static Event mEvent;
     private static boolean mWasReminderInit;
+    private static boolean mWasEndDateSet;
+    private static boolean mWasEndTimeSet;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -77,6 +79,9 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
         updateEndDate();
         updateEndTime();
         setupReminder();
+
+        mWasEndDateSet = (event != null);
+        mWasEndTimeSet = (event != null);
     }
 
     private void setupEditEvent() {
@@ -91,7 +96,7 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
     private void setupNewEvent(String dayCode) {
         setTitle(getResources().getString(R.string.new_event));
         mEventStartDateTime = Formatter.getDateTimeFromCode(dayCode).withZoneRetainFields(DateTimeZone.getDefault()).withHourOfDay(13);
-        mEventEndDateTime = Formatter.getDateTimeFromCode(dayCode).withZoneRetainFields(DateTimeZone.getDefault()).withHourOfDay(14);
+        mEventEndDateTime = mEventStartDateTime;
     }
 
     private void hideKeyboard() {
@@ -261,6 +266,9 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
         @Override
         public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
             dateSet(year, monthOfYear, dayOfMonth, true);
+            if (!mWasEndDateSet) {
+                dateSet(year, monthOfYear, dayOfMonth, false);
+            }
         }
     };
 
@@ -268,6 +276,9 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
         @Override
         public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
             timeSet(hourOfDay, minute, true);
+            if (!mWasEndTimeSet) {
+                timeSet(hourOfDay, minute, false);
+            }
         }
     };
 
@@ -292,6 +303,7 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
         } else {
             mEventEndDateTime = mEventEndDateTime.withYear(year).withMonthOfYear(month + 1).withDayOfMonth(day);
             updateEndDate();
+            mWasEndDateSet = true;
         }
     }
 
@@ -302,6 +314,7 @@ public class EventActivity extends SimpleActivity implements DBHelper.DBOperatio
         } else {
             mEventEndDateTime = mEventEndDateTime.withHourOfDay(hours).withMinuteOfHour(minutes);
             updateEndTime();
+            mWasEndTimeSet = true;
         }
     }
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 828566608..a7f92ca1d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -22,7 +22,7 @@
     <string name="details">Dettagli</string>
     <string name="title">Titolo</string>
     <string name="start">Inizio</string>
-    <string name="end">Fine</string>
+    <string name="end">Fine (facoltativo)</string>
     <string name="description">Descrizione</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b9f5233bc..145357b03 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -22,7 +22,7 @@
     <string name="details">詳細</string>
     <string name="title">タイトル</string>
     <string name="start">開始</string>
-    <string name="end">終了</string>
+    <string name="end">終了 (任意)</string>
     <string name="description">説明</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 5dbb766cc..c4ff97146 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -22,7 +22,7 @@
     <string name="details">Detaljer</string>
     <string name="title">Titel</string>
     <string name="start">Start</string>
-    <string name="end">Slut</string>
+    <string name="end">Slut (frivillig)</string>
     <string name="description">Beskrivning</string>
 
     <!-- About -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ff890d626..e4db45afd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,7 +22,7 @@
     <string name="details">Details</string>
     <string name="title">Title</string>
     <string name="start">Start</string>
-    <string name="end">End</string>
+    <string name="end">End (optional)</string>
     <string name="description">Description</string>
 
     <!-- About -->