diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
index c22eac79..09231e03 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
@@ -86,7 +86,7 @@ public class MilestoneView extends BaseFragment<MilestoneMvp.View, MilestonePres
         }
         toolbar.setTitle(R.string.milestone);
         toolbar.setOnMenuItemClickListener(item -> onAddMilestone());
-        toolbar.inflateMenu(R.menu.done_menu);
+        toolbar.inflateMenu(R.menu.add_menu);
         toolbar.setNavigationIcon(R.drawable.ic_clear);
         toolbar.setNavigationOnClickListener(v -> getActivity().finish());
         adapter = new MilestonesAdapter(getPresenter().getMilestones());
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
index bcaf5423..c76a1ec1 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
@@ -74,10 +74,7 @@ public class CreateMilestoneView extends BaseDialogFragment<CreateMilestoneMvp.V
         }
         toolbar.setTitle(R.string.create_milestone);
         toolbar.setNavigationIcon(R.drawable.ic_clear);
-        toolbar.setOnMenuItemClickListener(item -> {
-            dismiss();
-            return true;
-        });
+        toolbar.setNavigationOnClickListener(item -> dismiss());
         toolbar.inflateMenu(R.menu.add_menu);
         toolbar.setOnMenuItemClickListener(item -> {
             getPresenter().onSubmit(InputHelper.toString(title), InputHelper.toString(dueOnEditText), login, repo);