diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
index 4ee9983b7721..aa3a29511a2f 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
@@ -137,6 +137,10 @@ public class FieldBreakpoint extends BreakpointWithHighlighter<JavaFieldBreakpoi
     PsiField field = PositionUtil.getPsiElementAt(getProject(), PsiField.class, getSourcePosition());
     if(field != null) {
       setFieldName(field.getName());
+      PsiClass psiClass = field.getContainingClass();
+      if (psiClass != null) {
+        getProperties().myClassName = psiClass.getQualifiedName();
+      }
       myIsStatic = field.hasModifierProperty(PsiModifier.STATIC);
     }
     if (myIsStatic) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaFieldBreakpointType.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaFieldBreakpointType.java
index c539afe1263b..66b8284ae4cb 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaFieldBreakpointType.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/JavaFieldBreakpointType.java
@@ -78,8 +78,9 @@ public class JavaFieldBreakpointType extends JavaLineBreakpointTypeBase<JavaFiel
     //if(!isValid()) {
     //  return DebuggerBundle.message("status.breakpoint.invalid");
     //}
+
     JavaFieldBreakpointProperties properties = breakpoint.getProperties();
-    final String className = "Class";//properties.getClassName();
+    final String className = properties.myClassName;
     return className != null && !className.isEmpty() ? className + "." + properties.myFieldName : properties.myFieldName;
   }
 
@@ -107,7 +108,7 @@ public class JavaFieldBreakpointType extends JavaLineBreakpointTypeBase<JavaFiel
     final Ref<XLineBreakpoint> result = Ref.create(null);
     AddFieldBreakpointDialog dialog = new AddFieldBreakpointDialog(project) {
       protected boolean validateData() {
-        String className = getClassName();
+        final String className = getClassName();
         if (className.length() == 0) {
           Messages.showMessageDialog(project, DebuggerBundle.message("error.field.breakpoint.class.name.not.specified"),
                                      DebuggerBundle.message("add.field.breakpoint.dialog.title"), Messages.getErrorIcon());
@@ -131,7 +132,7 @@ public class JavaFieldBreakpointType extends JavaLineBreakpointTypeBase<JavaFiel
                 @Override
                 public void run() {
                   XLineBreakpoint<JavaFieldBreakpointProperties> fieldBreakpoint = XDebuggerManager.getInstance(project).getBreakpointManager()
-                    .addLineBreakpoint(JavaFieldBreakpointType.this, psiFile.getVirtualFile().getUrl(), line, new JavaFieldBreakpointProperties(fieldName));
+                    .addLineBreakpoint(JavaFieldBreakpointType.this, psiFile.getVirtualFile().getUrl(), line, new JavaFieldBreakpointProperties(fieldName, className));
                   result.set(fieldBreakpoint);
                 }
               });
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
index 2089d4952420..be10d56113f8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
@@ -118,6 +118,10 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
       mySignature = descriptor.methodSignature;
       myIsStatic = descriptor.isStatic;
     }
+    PsiClass psiClass = getPsiClass();
+    if (psiClass != null) {
+      getProperties().myClassPattern = psiClass.getQualifiedName();
+    }
     if (myIsStatic) {
       setInstanceFiltersEnabled(false);
     }
diff --git a/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/properties/JavaFieldBreakpointProperties.java b/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/properties/JavaFieldBreakpointProperties.java
index 42106b3c0eac..83f60613fbf0 100644
--- a/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/properties/JavaFieldBreakpointProperties.java
+++ b/java/debugger/impl/src/org/jetbrains/java/debugger/breakpoints/properties/JavaFieldBreakpointProperties.java
@@ -28,8 +28,12 @@ public class JavaFieldBreakpointProperties extends JavaBreakpointProperties<Java
   @Attribute("field_name")
   public String myFieldName;
 
-  public JavaFieldBreakpointProperties(String fieldName) {
+  @Attribute("class_name")
+  public String myClassName;
+
+  public JavaFieldBreakpointProperties(String fieldName, String className) {
     myFieldName = fieldName;
+    myClassName = className;
   }
 
   public JavaFieldBreakpointProperties() {
@@ -48,5 +52,6 @@ public class JavaFieldBreakpointProperties extends JavaBreakpointProperties<Java
     WATCH_MODIFICATION = state.WATCH_MODIFICATION;
     WATCH_ACCESS = state.WATCH_ACCESS;
     myFieldName = state.myFieldName;
+    myClassName = state.myClassName;
   }
 }