diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
index 001135f447..b9c0a8c7d3 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart
@@ -264,10 +264,10 @@ class _MentionDateBlockState extends State<MentionDateBlock> {
 
     try {
       if (timeFormat == TimeFormatPB.TwelveHour) {
-        return twelveHourFormat.parse(timeStr);
+        return twelveHourFormat.parseStrict(timeStr);
       }
 
-      return twentyFourHourFormat.parse(timeStr);
+      return twentyFourHourFormat.parseStrict(timeStr);
     } on FormatException {
       Log.error("failed to parse time string ($timeStr)");
       return DateTime.now();
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/time_text_field.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/time_text_field.dart
index d0c5d74b66..46c2e08a31 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/time_text_field.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/date_picker/widgets/time_text_field.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 import 'package:appflowy_backend/protobuf/flowy-database2/date_entities.pbenum.dart';
 import 'package:appflowy_popover/appflowy_popover.dart';
@@ -96,8 +97,50 @@ class _TimeTextFieldState extends State<TimeTextField> {
             ? _maxLengthTwelveHour
             : _maxLengthTwentyFourHour,
         showCounter: false,
+        inputFormatters: [TimeInputFormatter(widget.timeFormat)],
         onSubmitted: widget.onSubmitted,
       ),
     );
   }
 }
+
+class TimeInputFormatter extends TextInputFormatter {
+  TimeInputFormatter(this.timeFormat);
+
+  final TimeFormatPB timeFormat;
+  static const int colonPosition = 2;
+  static const int spacePosition = 5;
+
+  @override
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
+    final oldText = oldValue.text;
+    final newText = newValue.text;
+
+    // If the user has typed enough for a time separator(:) and hasn't already typed
+    if (newText.length == colonPosition + 1 &&
+        oldText.length == colonPosition &&
+        !newText.contains(":")) {
+      return _formatText(newText, colonPosition, ':');
+    }
+
+    // If the user has typed enough for an AM/PM separator and hasn't already typed
+    if (timeFormat == TimeFormatPB.TwelveHour &&
+        newText.length == spacePosition + 1 &&
+        oldText.length == spacePosition &&
+        newText[newText.length - 1] != ' ') {
+      return _formatText(newText, spacePosition, ' ');
+    }
+
+    return newValue;
+  }
+
+  TextEditingValue _formatText(String text, int index, String separator) {
+    return TextEditingValue(
+      text: '${text.substring(0, index)}$separator${text.substring(index)}',
+      selection: TextSelection.collapsed(offset: text.length + 1),
+    );
+  }
+}
diff --git a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart
index ffedd06bd1..994e427202 100644
--- a/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart
+++ b/frontend/appflowy_flutter/packages/flowy_infra_ui/lib/style_widget/text_field.dart
@@ -31,6 +31,7 @@ class FlowyTextField extends StatefulWidget {
   final InputDecoration? decoration;
   final TextAlignVertical? textAlignVertical;
   final TextInputAction? textInputAction;
+  final List<TextInputFormatter>? inputFormatters;
 
   const FlowyTextField({
     super.key,
@@ -60,6 +61,7 @@ class FlowyTextField extends StatefulWidget {
     this.decoration,
     this.textAlignVertical,
     this.textInputAction,
+    this.inputFormatters,
   });
 
   @override
@@ -153,6 +155,7 @@ class FlowyTextFieldState extends State<FlowyTextField> {
       style: widget.textStyle ?? Theme.of(context).textTheme.bodySmall,
       textAlignVertical: widget.textAlignVertical ?? TextAlignVertical.center,
       keyboardType: TextInputType.multiline,
+      inputFormatters: widget.inputFormatters,
       decoration: widget.decoration ??
           InputDecoration(
             constraints: widget.hintTextConstraints ??