diff --git a/SubMind.py b/SubMind.py
index 4c4859b..64158f4 100644
--- a/SubMind.py
+++ b/SubMind.py
@@ -1394,7 +1394,7 @@ def main():
     )
 
     edit_conv = ConversationHandler(
-        entry_points=[CallbackQueryHandler(edit_start, pattern='^edit_')],
+        entry_points=[CallbackQueryHandler(edit_start, pattern=r'^edit_\d+$')],
         states={
             EDIT_SELECT_FIELD: [CallbackQueryHandler(edit_field_selected, pattern='^editfield_')],
             EDIT_GET_NEW_VALUE: [
@@ -1416,7 +1416,7 @@ def main():
     )
 
     remind_conv = ConversationHandler(
-        entry_points=[CallbackQueryHandler(remind_settings_start, pattern='^remind_')],
+        entry_points=[CallbackQueryHandler(remind_settings_start, pattern=r'^remind_\d+$')],
         states={
             REMIND_SELECT_ACTION: [CallbackQueryHandler(remind_action_handler, pattern='^remindaction_')],
             REMIND_GET_DAYS: [MessageHandler(filters.TEXT & ~filters.COMMAND, remind_days_received)],