diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java
index b2a1ac0..982dfad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/viewsupport/HistoryDropDownAction.java
@@ -74,6 +74,9 @@
 			manager.addMenuListener(new IMenuListener() {
 				@Override
 				public void menuAboutToShow(IMenuManager manager2) {
+					if (fHistory == null) {
+						return;
+					}
 					List<E> entries= fHistory.getHistoryEntries();
 					boolean checkOthers= addEntryMenuItems(manager2, entries);