diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
index 89a5cd0a3f37..92ed37a2e624 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/IpnbFileEditor.java
@@ -332,8 +332,9 @@ public class IpnbFileEditor extends UserDataHolderBase implements FileEditor {
                              new CellSelectionListener() {
                                @Override
                                public void selectionChanged(@NotNull IpnbPanel ipnbPanel, boolean byMouse) {
-                                 if (myCellTypeCombo == null || byMouse) return;
+                                 if (myCellTypeCombo == null) return;
                                  updateCellTypeCombo(ipnbPanel);
+                                 if (byMouse) return;
                                  updateScrollPosition(ipnbPanel);
                                }
                              });