diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
index 742a07d3be46..6cf000742ae6 100644
--- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
@@ -56,7 +56,7 @@ xdebugger.button.evaluate=E&valuate
 xdebugger.evaluate.dialog.close=Close
 xdebugger.dialog.title.evaluate.expression=Evaluate Expression
 xdebugger.evaluate.label.expression=Expression:
-xdebugger.evaluate.addtowatches.hint=Use Alt+Enter to add to Watches
+xdebugger.evaluate.addtowatches.hint=Use Control+Shift+Enter to add to Watches
 dialog.title.evaluate.code.fragment=Evaluate Code Fragment
 button.text.code.fragment.mode=Code Fragment &Mode
 button.text.expression.mode=Expression &Mode
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
index 45b140ddf8e8..e3295b5cce37 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/ExpressionInputComponent.java
@@ -46,6 +46,11 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
     myExpressionComboBox = new XDebuggerExpressionComboBox(project, editorsProvider, "evaluateExpression", sourcePosition);
     myExpressionComboBox.getComboBox().setMinimumAndPreferredWidth(250);
     myMainPanel.add(myExpressionComboBox.getComponent(), BorderLayout.CENTER);
+    final JBLabel help = new JBLabel(XDebuggerBundle.message("xdebugger.evaluate.addtowatches.hint"), SwingConstants.RIGHT);
+    help.setBorder(IdeBorderFactory.createEmptyBorder(2,0,6,0));
+    help.setComponentStyle(UIUtil.ComponentStyle.SMALL);
+    help.setFontColor(UIUtil.FontColor.BRIGHTER);
+    myMainPanel.add(help, BorderLayout.SOUTH);
     if (expression != null) {
       myExpressionComboBox.setExpression(expression);
     }
@@ -56,11 +61,6 @@ public class ExpressionInputComponent extends EvaluationInputComponent {
   public void addComponent(JPanel contentPanel, JPanel resultPanel) {
     contentPanel.add(resultPanel, BorderLayout.CENTER);
     contentPanel.add(myMainPanel, BorderLayout.NORTH);
-    final JBLabel hint = new JBLabel(XDebuggerBundle.message("xdebugger.evaluate.addtowatches.hint"), SwingConstants.RIGHT);
-    hint.setBorder(IdeBorderFactory.createEmptyBorder(2, 0, 6, 0));
-    hint.setComponentStyle(UIUtil.ComponentStyle.SMALL);
-    hint.setFontColor(UIUtil.FontColor.BRIGHTER);
-    contentPanel.add(hint, BorderLayout.SOUTH);
   }
 
   @NotNull
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
index 9e94a956eb3d..079776c29cba 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java
@@ -121,7 +121,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
         doOKAction();
         addToWatches();
       }
-    }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.ALT_DOWN_MASK)), getRootPane(), myDisposable);
+    }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK)), getRootPane(), myDisposable);
 
     new AnAction() {
       @Override
@@ -169,7 +169,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper {
       @Override
       public void actionPerformed(ActionEvent e) {
         super.actionPerformed(e);
-        if (((e.getModifiers() & InputEvent.ALT_MASK) != 0)) {
+        if (((e.getModifiers() & (InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK)) == (InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK))) {
           addToWatches();
         }
       }