diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
index 9f64fcffe1cc..7d0d8b83604f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
@@ -76,19 +76,39 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     if (!myField.isValid()) return false;
-    PsiClass aClass = myField.getContainingClass();
+
+    final PsiClass aClass = myField.getContainingClass();
     if (aClass == null) {
       return false;
     }
-    if (myCreateGetter && PropertyUtil.findPropertyGetter(aClass, myPropertyName, myField.hasModifierProperty(PsiModifier.STATIC), false) != null) {
-      return false;
+
+    if (myCreateGetter){
+      if (isStaticFinal(myField) || PropertyUtil.findPropertyGetter(aClass, myPropertyName, isStatic(myField), false) != null){
+        return false;
+      }
     }
-    if (myCreateSetter && PropertyUtil.findPropertySetter(aClass, myPropertyName, myField.hasModifierProperty(PsiModifier.STATIC), false) != null) {
-      return false;
+
+    if (myCreateSetter){
+      if(isFinal(myField) || PropertyUtil.findPropertySetter(aClass, myPropertyName, isStatic(myField), false) != null){
+        return false;
+      }
     }
+
     return true;
   }
 
+  private static boolean isFinal(@NotNull PsiField field){
+    return field.hasModifierProperty(PsiModifier.FINAL);
+  }
+
+  private static boolean isStatic(@NotNull PsiField field){
+    return field.hasModifierProperty(PsiModifier.STATIC);
+  }
+
+  private static boolean isStaticFinal(@NotNull PsiField field){
+    return isStatic(field) && isFinal(field);
+  }
+
   @Override
   public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
     if (!CodeInsightUtilBase.preparePsiElementForWrite(myField)) return;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetter.java
new file mode 100644
index 000000000000..ed7fe9733435
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetter.java
@@ -0,0 +1,8 @@
+// "Create getter for 's'" "true"
+class A {
+  private String s;
+
+    public String getS() {
+        return s;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetterAndSetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetterAndSetter.java
new file mode 100644
index 000000000000..3f55db351020
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateGetterAndSetter.java
@@ -0,0 +1,12 @@
+// "Create getter and setter for 's'" "true"
+class A {
+  private String s;
+
+    public String getS() {
+        return s;
+    }
+
+    public void setS(String s) {
+        this.s = s;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateSetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateSetter.java
new file mode 100644
index 000000000000..e4be4403cf82
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/afterCreateSetter.java
@@ -0,0 +1,8 @@
+// "Create setter for 's'" "true"
+class A {
+  private String s;
+
+    public void setS(String s) {
+        this.s = s;
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetter.java
new file mode 100644
index 000000000000..e12e44564d95
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetter.java
@@ -0,0 +1,4 @@
+// "Create getter for 's'" "true"
+class A {
+  private String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetterAndSetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetterAndSetter.java
new file mode 100644
index 000000000000..33aafaed0a7f
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateGetterAndSetter.java
@@ -0,0 +1,4 @@
+// "Create getter and setter for 's'" "true"
+class A {
+  private String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateSetter.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateSetter.java
new file mode 100644
index 000000000000..ee94e8edbd89
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeCreateSetter.java
@@ -0,0 +1,4 @@
+// "Create setter for 's'" "true"
+class A {
+  private String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForFinal.java
new file mode 100644
index 000000000000..b458d3c6f84b
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForFinal.java
@@ -0,0 +1,4 @@
+// "Create getter and setter for 's'" "false"
+class A {
+  private final String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForStaticFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForStaticFinal.java
new file mode 100644
index 000000000000..536d3559ef61
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterAndSetterForStaticFinal.java
@@ -0,0 +1,4 @@
+// "Create getter and setter for 's'" "false"
+class A {
+  private final static String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterForStaticFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterForStaticFinal.java
new file mode 100644
index 000000000000..02799cea8b86
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoGetterForStaticFinal.java
@@ -0,0 +1,4 @@
+// "Create setter for 's'" "false"
+class A {
+  private final static String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForFinal.java
new file mode 100644
index 000000000000..e39449d5f483
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForFinal.java
@@ -0,0 +1,4 @@
+// "Create setter for 's'" "false"
+class A {
+  private final String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForStaticFinal.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForStaticFinal.java
new file mode 100644
index 000000000000..02799cea8b86
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter/beforeNoSetterForStaticFinal.java
@@ -0,0 +1,4 @@
+// "Create setter for 's'" "false"
+class A {
+  private final static String <caret>s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java
new file mode 100644
index 000000000000..a73f222be45f
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateGetterOrSetterTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.daemon.quickFix;
+
+import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class CreateGetterOrSetterTest extends LightQuickFixTestCase {
+  public void test() throws Exception {
+    enableInspectionTool(new UnusedSymbolLocalInspection());
+    doAllTests();
+  }
+
+
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/createGetterOrSetter";
+  }
+}
\ No newline at end of file