diff --git a/plugin_sample/src/org/jetbrains/plugins/sample/SimpleAction.java b/plugin_sample/src/org/jetbrains/plugins/sample/SimpleAction.java
index 2a44cf883..09b18f64e 100644
--- a/plugin_sample/src/org/jetbrains/plugins/sample/SimpleAction.java
+++ b/plugin_sample/src/org/jetbrains/plugins/sample/SimpleAction.java
@@ -2,6 +2,7 @@ package org.jetbrains.plugins.sample;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -14,7 +15,10 @@ public class SimpleAction extends AnAction {
 
     @Override
     public void update(@NotNull AnActionEvent e) {
-        e.getPresentation().setVisible(true);
-        e.getPresentation().setEnabled(true);
+        //Make action visible and available only when project is defined
+        final Project project = e.getProject();
+        boolean isAvailable = project != null;
+        e.getPresentation().setVisible(isAvailable);
+        e.getPresentation().setEnabled(isAvailable);
     }
 }