1 files changed, 6 insertions, 8 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java
index 764b9c1617..e802475ae2 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/CompareWithWorkingTreeHandler.java
@@ -15,9 +15,9 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.egit.core.project.RepositoryMapping;
-import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.internal.CompareUtils;
 import org.eclipse.egit.ui.internal.GitCompareFileRevisionEditorInput;
+import org.eclipse.egit.ui.internal.history.GitHistoryPage;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.team.ui.synchronize.SaveableCompareEditorInput;
@@ -51,13 +51,11 @@ public class CompareWithWorkingTreeHandler extends
 
 	@Override
 	public boolean isEnabled() {
-		try {
-			int size = getSelection(null).size();
-			return IFile.class.isAssignableFrom(getInput(null).getClass())
-					&& size == 1;
-		} catch (ExecutionException e) {
-			Activator.handleError(e.getMessage(), e, false);
+		GitHistoryPage page = getPage();
+		if (page == null)
 			return false;
-		}
+		int size = getSelection(page).size();
+		return IFile.class.isAssignableFrom(page.getInput().getClass())
+				&& size == 1;
 	}
 }