diff --git a/app/src/main/java/com/gh4a/activities/IssueEditActivity.java b/app/src/main/java/com/gh4a/activities/IssueEditActivity.java
index eb83e27c4..3ec645f0b 100644
--- a/app/src/main/java/com/gh4a/activities/IssueEditActivity.java
+++ b/app/src/main/java/com/gh4a/activities/IssueEditActivity.java
@@ -41,6 +41,7 @@
 import com.gh4a.Gh4Application;
 import com.gh4a.R;
 import com.gh4a.ServiceFactory;
+import com.gh4a.dialogs.MilestoneDialog;
 import com.gh4a.utils.ApiHelpers;
 import com.gh4a.utils.AvatarHandler;
 import com.gh4a.utils.Optional;
@@ -53,13 +54,11 @@
 import com.meisolsson.githubsdk.model.Content;
 import com.meisolsson.githubsdk.model.ContentType;
 import com.meisolsson.githubsdk.model.Issue;
-import com.meisolsson.githubsdk.model.IssueState;
 import com.meisolsson.githubsdk.model.Label;
 import com.meisolsson.githubsdk.model.Milestone;
 import com.meisolsson.githubsdk.model.User;
 import com.meisolsson.githubsdk.model.request.issue.IssueRequest;
 import com.meisolsson.githubsdk.service.issues.IssueLabelService;
-import com.meisolsson.githubsdk.service.issues.IssueMilestoneService;
 import com.meisolsson.githubsdk.service.issues.IssueService;
 import com.meisolsson.githubsdk.service.repositories.RepositoryCollaboratorService;
 import com.meisolsson.githubsdk.service.repositories.RepositoryContentService;
@@ -74,7 +73,7 @@
 
 public class IssueEditActivity extends BasePagerActivity implements
         AppBarLayout.OnOffsetChangedListener, View.OnClickListener,
-        View.OnFocusChangeListener {
+        View.OnFocusChangeListener, MilestoneDialog.SelectionCallback {
     public static Intent makeCreateIntent(Context context, String repoOwner, String repoName) {
         // can't reuse makeEditIntent here, because even a null extra counts for hasExtra()
         return new Intent(context, IssueEditActivity.class)
@@ -91,7 +90,6 @@ public static Intent makeEditIntent(Context context, String repoOwner,
     }
 
     private static final int REQUEST_MANAGE_LABELS = 1000;
-    private static final int REQUEST_MANAGE_MILESTONES = 1001;
 
     private static final int ID_LOADER_COLLABORATOR_STATUS = 0;
 
@@ -103,7 +101,6 @@ public static Intent makeEditIntent(Context context, String repoOwner,
     private String mRepoName;
 
     private boolean mIsCollaborator;
-    private List<Milestone> mAllMilestone;
     private List<User> mAllAssignee;
     private List<Label> mAllLabels;
     private Issue mEditIssue;
@@ -266,7 +263,6 @@ protected boolean canSwipeToRefresh() {
     @Override
     public void onRefresh() {
         mAllAssignee = null;
-        mAllMilestone = null;
         mAllLabels = null;
         mIsCollaborator = false;
         loadCollaboratorStatus(true);
@@ -336,54 +332,36 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 // Require reload of labels
                 mAllLabels = null;
             }
-        } else if (requestCode == REQUEST_MANAGE_MILESTONES) {
-            if (resultCode == RESULT_OK) {
-                // Require reload of milestones
-                mAllMilestone = null;
-            }
         } else {
             super.onActivityResult(requestCode, resultCode, data);
         }
     }
 
-    private void showMilestonesDialog() {
-        if (mAllMilestone == null) {
-            loadMilestones();
-        } else {
-            final String[] milestones = new String[mAllMilestone.size() + 1];
-            Milestone selectedMilestone = mEditIssue.milestone();
-            int selected = 0;
-
-            milestones[0] = getResources().getString(R.string.issue_clear_milestone);
-            for (int i = 1; i <= mAllMilestone.size(); i++) {
-                Milestone m = mAllMilestone.get(i - 1);
-                milestones[i] = m.title();
-                if (selectedMilestone != null && m.number().equals(selectedMilestone.number())) {
-                    selected = i;
-                }
-            }
-
-            final DialogInterface.OnClickListener selectCb = (dialog, which) -> {
-                mEditIssue = mEditIssue.toBuilder()
-                        .milestone(which == 0 ? null : mAllMilestone.get(which - 1))
-                        .build();
-                updateOptionViews();
-                dialog.dismiss();
-            };
-
-            new AlertDialog.Builder(this)
-                    .setCancelable(true)
-                    .setTitle(R.string.issue_milestone_hint)
-                    .setSingleChoiceItems(milestones, selected, selectCb)
-                    .setNegativeButton(R.string.cancel, null)
-                    .setNeutralButton(R.string.issue_manage_milestones, (dialog, which) -> {
-                        Intent intent = IssueMilestoneListActivity.makeIntent(
-                                IssueEditActivity.this, mRepoOwner, mRepoName,
-                                mEditIssue.pullRequest() != null);
-                        startActivityForResult(intent, REQUEST_MANAGE_MILESTONES);
-                    })
-                    .show();
+    @Override
+    public void onMilestoneSelected(MilestoneDialog.MilestoneSelection milestoneSelection) {
+        Milestone milestone;
+        switch (milestoneSelection.type) {
+            case NO_MILESTONE:
+                milestone = null;
+                break;
+            case MILESTONE:
+                milestone = milestoneSelection.milestone;
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported milestone selection type " + milestoneSelection.type);
         }
+        mEditIssue = mEditIssue.toBuilder()
+                .milestone(milestone)
+                .build();
+        updateOptionViews();
+    }
+
+    private void showMilestonesDialog() {
+        boolean fromPullRequest = mEditIssue.pullRequest() != null;
+        MilestoneDialog dialog = MilestoneDialog.newInstance(mRepoOwner, mRepoName, fromPullRequest, false, true);
+        getSupportFragmentManager().beginTransaction()
+                .add(dialog, "dialog_milestone")
+                .commitAllowingStateLoss();
     }
 
     private void showAssigneesDialog() {
@@ -611,18 +589,6 @@ private void loadLabels() {
                 }, this::handleLoadFailure));
     }
 
-    private void loadMilestones() {
-        final IssueMilestoneService service = ServiceFactory.get(IssueMilestoneService.class, false);
-        registerTemporarySubscription(ApiHelpers.PageIterator
-                .toSingle(page -> service.getRepositoryMilestones(mRepoOwner, mRepoName, "open", page))
-                .compose(RxUtils::doInBackground)
-                .compose(RxUtils.wrapWithProgressDialog(this, R.string.loading_msg))
-                .subscribe(result -> {
-                    mAllMilestone = result;
-                    showMilestonesDialog();
-                }, this::handleLoadFailure));
-    }
-
     private void loadPotentialAssignees() {
         final RepositoryCollaboratorService service =
                 ServiceFactory.get(RepositoryCollaboratorService.class, false);
diff --git a/app/src/main/java/com/gh4a/activities/IssueListActivity.java b/app/src/main/java/com/gh4a/activities/IssueListActivity.java
index e1bc6a964..cc35e1d35 100644
--- a/app/src/main/java/com/gh4a/activities/IssueListActivity.java
+++ b/app/src/main/java/com/gh4a/activities/IssueListActivity.java
@@ -20,8 +20,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
@@ -38,6 +38,7 @@
 import com.gh4a.Gh4Application;
 import com.gh4a.R;
 import com.gh4a.ServiceFactory;
+import com.gh4a.dialogs.MilestoneDialog;
 import com.gh4a.fragment.IssueListFragment;
 import com.gh4a.fragment.LoadingListFragmentBase;
 import com.gh4a.utils.ApiHelpers;
@@ -45,13 +46,10 @@
 import com.gh4a.utils.SingleFactory;
 import com.gh4a.utils.UiUtils;
 import com.meisolsson.githubsdk.model.Issue;
-import com.meisolsson.githubsdk.model.IssueState;
 import com.meisolsson.githubsdk.model.Label;
-import com.meisolsson.githubsdk.model.Milestone;
 import com.meisolsson.githubsdk.model.User;
 import com.meisolsson.githubsdk.service.issues.IssueAssigneeService;
 import com.meisolsson.githubsdk.service.issues.IssueLabelService;
-import com.meisolsson.githubsdk.service.issues.IssueMilestoneService;
 
 import java.util.List;
 import java.util.Locale;
@@ -59,7 +57,7 @@
 public class IssueListActivity extends BaseFragmentPagerActivity implements
         View.OnClickListener, LoadingListFragmentBase.OnRecyclerViewCreatedListener,
         SearchView.OnCloseListener, SearchView.OnQueryTextListener,
-        MenuItem.OnActionExpandListener {
+        MenuItem.OnActionExpandListener, MilestoneDialog.SelectionCallback {
     public static Intent makeIntent(Context context, String repoOwner, String repoName) {
         return makeIntent(context, repoOwner, repoName, false);
     }
@@ -94,7 +92,6 @@ public static Intent makeIntent(Context context, String repoOwner, String repoNa
     private IssueListFragment mOpenFragment;
     private Boolean mIsCollaborator;
     private List<Label> mLabels;
-    private List<Milestone> mMilestones;
     private List<User> mAssignees;
 
     private final IssueListFragment.SortDrawerHelper mSortHelper =
@@ -175,7 +172,6 @@ protected void onInitExtras(Bundle extras) {
     @Override
     public void onRefresh() {
         mAssignees = null;
-        mMilestones = null;
         mLabels = null;
         mIsCollaborator = null;
         updateRightNavigationDrawer();
@@ -360,7 +356,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 filterLabel();
                 return true;
             case R.id.filter_by_milestone:
-                filterMilestone();
+                showMilestonesDialog();
                 return true;
             case R.id.filter_by_participating:
                 filterParticipating();
@@ -468,6 +464,22 @@ protected Intent navigateUp() {
         return RepositoryActivity.makeIntent(this, mRepoOwner, mRepoName);
     }
 
+    @Override
+    public void onMilestoneSelected(MilestoneDialog.MilestoneSelection milestoneSelection) {
+        switch (milestoneSelection.type) {
+            case NO_MILESTONE:
+                mSelectedMilestone = "";
+                break;
+            case ANY_MILESTONE:
+                mSelectedMilestone = null;
+                break;
+            case MILESTONE:
+                mSelectedMilestone = milestoneSelection.milestone.title();
+                break;
+        }
+        onFilterUpdated();
+    }
+
     private void setSearchMode(boolean enabled) {
         boolean changed = mSearchMode != enabled;
         mSearchMode = enabled;
@@ -550,32 +562,10 @@ private void showLabelsDialog() {
     }
 
     private void showMilestonesDialog() {
-        final String[] milestones = new String[mMilestones.size() + 2];
-        int selected = mSelectedMilestone != null && mSelectedMilestone.isEmpty() ? 1 : 0;
-
-        milestones[0] = getResources().getString(R.string.issue_filter_by_any_milestone);
-        milestones[1] = getResources().getString(R.string.issue_filter_by_no_milestone);
-
-        for (int i = 0; i < mMilestones.size(); i++) {
-            milestones[i + 2] = mMilestones.get(i).title();
-            if (TextUtils.equals(mSelectedMilestone, milestones[i + 2])) {
-                selected = i + 2;
-            }
-        }
-
-        DialogInterface.OnClickListener selectCb = (dialog, which) -> {
-            mSelectedMilestone =
-                    which == 0 ? null : which == 1 ? "" : milestones[which];
-            dialog.dismiss();
-            onFilterUpdated();
-        };
-
-        new AlertDialog.Builder(this)
-                .setCancelable(true)
-                .setTitle(R.string.issue_filter_by_milestone)
-                .setSingleChoiceItems(milestones, selected, selectCb)
-                .setNegativeButton(R.string.cancel, null)
-                .show();
+        MilestoneDialog dialog = MilestoneDialog.newInstance(mRepoOwner, mRepoName, mIsPullRequest, true, false);
+        getSupportFragmentManager().beginTransaction()
+                .add(dialog, "dialog_milestone")
+                .commitAllowingStateLoss();
     }
 
     private void onFilterUpdated() {
@@ -630,22 +620,6 @@ private void filterAssignee() {
         }
     }
 
-    private void filterMilestone() {
-        if (mMilestones != null) {
-            showMilestonesDialog();
-        } else {
-            final IssueMilestoneService service = ServiceFactory.get(IssueMilestoneService.class, false);
-            registerTemporarySubscription(ApiHelpers.PageIterator
-                    .toSingle(page -> service.getRepositoryMilestones(mRepoOwner, mRepoName, "open", page))
-                    .compose(RxUtils::doInBackground)
-                    .compose(RxUtils.wrapWithProgressDialog(this, R.string.loading_msg))
-                    .subscribe(milestones -> {
-                        mMilestones = milestones;
-                        showMilestonesDialog();
-                    }, this::handleLoadFailure));
-        }
-    }
-
     private void filterLabel() {
         if (mLabels != null) {
             showLabelsDialog();
diff --git a/app/src/main/java/com/gh4a/dialogs/BasePagerDialog.java b/app/src/main/java/com/gh4a/dialogs/BasePagerDialog.java
new file mode 100644
index 000000000..32b506abe
--- /dev/null
+++ b/app/src/main/java/com/gh4a/dialogs/BasePagerDialog.java
@@ -0,0 +1,116 @@
+package com.gh4a.dialogs;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.SparseArray;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import com.gh4a.BaseActivity;
+import com.gh4a.R;
+
+public abstract class BasePagerDialog extends DialogFragment implements View.OnClickListener {
+    private LinearLayout mButtonBar;
+    private FragmentAdapter mPagerAdapter;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.dialog_pager, container, false);
+
+        ViewPager pager = view.findViewById(R.id.dialog_pager);
+        mPagerAdapter = new FragmentAdapter(getChildFragmentManager());
+        pager.setAdapter(mPagerAdapter);
+
+        mButtonBar = view.findViewById(R.id.button_bar);
+
+        Button cancelButton = view.findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(this);
+
+        return view;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v.getId() == R.id.cancel_button) {
+            dismiss();
+        }
+    }
+
+    protected void refreshPages() {
+        for (int position = 0; position < mPagerAdapter.getCount(); position++) {
+            Fragment fragment = mPagerAdapter.getExistingFragment(position);
+            if (fragment instanceof BaseActivity.RefreshableChild) {
+                ((BaseActivity.RefreshableChild) fragment).onRefresh();
+            }
+        }
+    }
+
+    protected Button addButton(int textResId) {
+        Button button = (Button) getLayoutInflater()
+                .inflate(R.layout.dialog_button, mButtonBar, false);
+        button.setText(textResId);
+        button.setOnClickListener(this);
+
+        mButtonBar.addView(button, mButtonBar.getChildCount() - 1);
+        if (mButtonBar.getChildCount() >= 3) {
+            mButtonBar.setOrientation(LinearLayout.VERTICAL);
+        }
+
+        return button;
+    }
+
+    protected abstract int[] getTabTitleResIds();
+
+    protected abstract Fragment makeFragment(int position);
+
+    private class FragmentAdapter extends FragmentPagerAdapter {
+        private final SparseArray<Fragment> mFragments = new SparseArray<>();
+
+        FragmentAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return makeFragment(position);
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            Fragment f = (Fragment) super.instantiateItem(container, position);
+            mFragments.put(position, f);
+            return f;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            super.destroyItem(container, position, object);
+            mFragments.remove(position);
+        }
+
+        Fragment getExistingFragment(int position) {
+            return mFragments.get(position);
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return getString(getTabTitleResIds()[position]);
+        }
+
+        @Override
+        public int getCount() {
+            int[] titleResIds = getTabTitleResIds();
+            return titleResIds != null ? titleResIds.length : 0;
+        }
+    }
+}
diff --git a/app/src/main/java/com/gh4a/dialogs/MilestoneDialog.java b/app/src/main/java/com/gh4a/dialogs/MilestoneDialog.java
new file mode 100644
index 000000000..77b9d2a3e
--- /dev/null
+++ b/app/src/main/java/com/gh4a/dialogs/MilestoneDialog.java
@@ -0,0 +1,160 @@
+package com.gh4a.dialogs;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.gh4a.R;
+import com.gh4a.activities.IssueMilestoneListActivity;
+import com.gh4a.fragment.IssueMilestoneListFragment;
+import com.meisolsson.githubsdk.model.Milestone;
+
+public class MilestoneDialog extends BasePagerDialog
+        implements IssueMilestoneListFragment.SelectionCallback {
+    private static final String EXTRA_OWNER = "owner";
+    private static final String EXTRA_REPO = "repo";
+    private static final String EXTRA_SHOW_ANY_MILESTONE = "show_any_milestone";
+    private static final String EXTRA_SHOW_MANAGE_MILESTONES_BUTTON = "show_manage_milestones_button";
+    private static final String EXTRA_FROM_PULL_REQUEST = "from_pull_request";
+    private static final int[] TITLES = new int[]{
+            R.string.open, R.string.closed
+    };
+    private static final int REQUEST_MANAGE_MILESTONES = 3000;
+
+    public static MilestoneDialog newInstance(String repoOwner, String repoName,
+            boolean fromPullRequest, boolean showAnyMilestoneButton,
+            boolean showManageMilestonesButton) {
+        MilestoneDialog dialog = new MilestoneDialog();
+        Bundle args = new Bundle();
+        args.putString(EXTRA_OWNER, repoOwner);
+        args.putString(EXTRA_REPO, repoName);
+        args.putBoolean(EXTRA_FROM_PULL_REQUEST, fromPullRequest);
+        args.putBoolean(EXTRA_SHOW_ANY_MILESTONE, showAnyMilestoneButton);
+        args.putBoolean(EXTRA_SHOW_MANAGE_MILESTONES_BUTTON, showManageMilestonesButton);
+        dialog.setArguments(args);
+        return dialog;
+    }
+
+    private String mRepoOwner;
+    private String mRepoName;
+    private boolean mFromPullRequest;
+    private boolean mShowAnyMilestoneButton;
+    private boolean mShowManageMilestonesButton;
+    private Button mNoMilestoneButton;
+    private Button mAnyMilestoneButton;
+    private Button mManageMilestonesButton;
+    private SelectionCallback mSelectionCallback;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle args = getArguments();
+        mRepoOwner = args.getString(EXTRA_OWNER);
+        mRepoName = args.getString(EXTRA_REPO);
+        mFromPullRequest = args.getBoolean(EXTRA_FROM_PULL_REQUEST);
+        mShowAnyMilestoneButton = args.getBoolean(EXTRA_SHOW_ANY_MILESTONE);
+        mShowManageMilestonesButton = args.getBoolean(EXTRA_SHOW_MANAGE_MILESTONES_BUTTON);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (!(context instanceof SelectionCallback)) {
+            throw new IllegalStateException("Parent of " + MilestoneDialog.class.getSimpleName()
+                    + " must implement " + SelectionCallback.class.getSimpleName());
+        }
+        mSelectionCallback = (SelectionCallback) context;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+            @Nullable Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+        if (mShowAnyMilestoneButton) {
+            mAnyMilestoneButton = addButton(R.string.issue_filter_by_any_milestone);
+        }
+        mNoMilestoneButton = addButton(R.string.issue_filter_by_no_milestone);
+        if (mShowManageMilestonesButton) {
+            mManageMilestonesButton = addButton(R.string.issue_manage_milestones);
+        }
+        return view;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mNoMilestoneButton) {
+            onMilestoneSelected(MilestoneSelection.Type.NO_MILESTONE);
+        } else if (v == mAnyMilestoneButton) {
+            onMilestoneSelected(MilestoneSelection.Type.ANY_MILESTONE);
+        } else if (v == mManageMilestonesButton) {
+            Intent intent = IssueMilestoneListActivity.makeIntent(
+                    getContext(), mRepoOwner, mRepoName, mFromPullRequest);
+            startActivityForResult(intent, REQUEST_MANAGE_MILESTONES);
+        } else {
+            super.onClick(v);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_MANAGE_MILESTONES) {
+            if (resultCode == Activity.RESULT_OK) {
+                refreshPages();
+            }
+        } else {
+            super.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected int[] getTabTitleResIds() {
+        return TITLES;
+    }
+
+    @Override
+    protected Fragment makeFragment(int position) {
+        return IssueMilestoneListFragment.newInstance(mRepoOwner, mRepoName, position == 1, mFromPullRequest);
+    }
+
+    @Override
+    public void onMilestoneSelected(@Nullable Milestone milestone) {
+        onMilestoneSelected(MilestoneSelection.Type.MILESTONE, milestone);
+    }
+
+    private void onMilestoneSelected(MilestoneSelection.Type type) {
+        onMilestoneSelected(type, null);
+    }
+
+    private void onMilestoneSelected(MilestoneSelection.Type type, Milestone milestone) {
+        mSelectionCallback.onMilestoneSelected(new MilestoneSelection(type, milestone));
+        dismiss();
+    }
+
+    public interface SelectionCallback {
+        void onMilestoneSelected(MilestoneSelection milestoneSelection);
+    }
+
+    public static class MilestoneSelection {
+        public final Type type;
+        public final Milestone milestone;
+
+        MilestoneSelection(Type type, Milestone milestone) {
+            this.type = type;
+            this.milestone = milestone;
+        }
+
+        public enum Type {
+            NO_MILESTONE,
+            ANY_MILESTONE,
+            MILESTONE
+        }
+    }
+}
diff --git a/app/src/main/java/com/gh4a/fragment/IssueMilestoneListFragment.java b/app/src/main/java/com/gh4a/fragment/IssueMilestoneListFragment.java
index a53f2bd77..7d3d5a101 100644
--- a/app/src/main/java/com/gh4a/fragment/IssueMilestoneListFragment.java
+++ b/app/src/main/java/com/gh4a/fragment/IssueMilestoneListFragment.java
@@ -18,6 +18,9 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.content.Loader;
 import android.support.v7.widget.RecyclerView;
 
 import com.gh4a.R;
@@ -84,9 +87,14 @@ protected int getEmptyTextResId() {
 
     @Override
     public void onItemClick(Milestone milestone) {
-        startActivityForResult(IssueMilestoneEditActivity.makeEditIntent(
-                getActivity(), mRepoOwner, mRepoName, milestone, mFromPullRequest),
-                REQUEST_EDIT_MILESTONE);
+        Fragment parentFragment = getParentFragment();
+        if (parentFragment instanceof SelectionCallback) {
+            ((SelectionCallback) parentFragment).onMilestoneSelected(milestone);
+        } else {
+            startActivityForResult(IssueMilestoneEditActivity.makeEditIntent(
+                    getActivity(), mRepoOwner, mRepoName, milestone, mFromPullRequest),
+                    REQUEST_EDIT_MILESTONE);
+        }
     }
 
     @Override
@@ -110,4 +118,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
         }
     }
-}
\ No newline at end of file
+
+    public interface SelectionCallback {
+        void onMilestoneSelected(@Nullable Milestone milestone);
+    }
+}
diff --git a/app/src/main/res/layout/dialog_button.xml b/app/src/main/res/layout/dialog_button.xml
new file mode 100644
index 000000000..0c83cf150
--- /dev/null
+++ b/app/src/main/res/layout/dialog_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="?buttonBarButtonStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    tools:text="Button" />
diff --git a/app/src/main/res/layout/dialog_pager.xml b/app/src/main/res/layout/dialog_pager.xml
new file mode 100644
index 000000000..baced3b37
--- /dev/null
+++ b/app/src/main/res/layout/dialog_pager.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/dialog_pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/dialog_pager_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </android.support.v4.view.ViewPager>
+
+    <LinearLayout
+        android:id="@+id/button_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/cancel_button"
+            style="?buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/cancel" />
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/row_milestone.xml b/app/src/main/res/layout/row_milestone.xml
index ed86d9a86..f0a6d96ce 100644
--- a/app/src/main/res/layout/row_milestone.xml
+++ b/app/src/main/res/layout/row_milestone.xml
@@ -40,6 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="8dp"
+        android:gravity="end"
         android:orientation="vertical">
 
         <com.gh4a.widget.StyleableTextView
@@ -69,4 +70,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b7739d93..9127c3a3e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -397,7 +397,7 @@
     <string name="issue_filter_by_any_label">Any label</string>
     <string name="issue_filter_by_no_label">Unlabeled</string>
     <string name="issue_filter_by_any_milestone">Any milestone</string>
-    <string name="issue_filter_by_no_milestone">No milestone set</string>
+    <string name="issue_filter_by_no_milestone">No milestone</string>
     <string name="issue_filter_by_any_assignee">Any assignee</string>
     <string name="issue_filter_by_no_assignee">Unassigned</string>
     <string name="issue_filter_remove">Remove filter</string>