diff --git a/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js b/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js
index 7a38da3fb2d4..7451f98fe7c0 100644
--- a/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js
+++ b/devtools/client/debugger/new/src/components/Editor/ColumnBreakpoint.js
@@ -74,7 +74,7 @@ export default class ColumnBreakpoint extends PureComponent<Props> {
       onContextMenu: this.onContextMenu
     });

-    this.bookmark = doc.setBookmark({ line: line - 1, ch: column }, { widget });
+    this.bookmark = doc.setBookmark({ line: line - 1, ch: column }, { widget, handleMouseEvents: false });
   };

   clearColumnBreakpoint = () => {
@@ -119,6 +119,7 @@ export default class ColumnBreakpoint extends PureComponent<Props> {
   }

   componentDidUpdate() {
+    console.log(`CB CDU`)
     this.clearColumnBreakpoint();
     this.addColumnBreakpoint();
   }
diff --git a/devtools/client/debugger/new/src/reducers/breakpoints.js b/devtools/client/debugger/new/src/reducers/breakpoints.js
index 3b3c38fa1adb..dd36f29d8fe3 100644
--- a/devtools/client/debugger/new/src/reducers/breakpoints.js
+++ b/devtools/client/debugger/new/src/reducers/breakpoints.js
@@ -8,7 +8,7 @@
  * Breakpoints reducer
  * @module reducers/breakpoints
  */
-
+import { createSelector } from "reselect";
 import { isGeneratedId, isOriginalId } from "devtools-source-map";
 import { isEqual } from "lodash";

@@ -288,13 +288,20 @@ function isMatchingLocation(location1, location2) {

 type OuterState = { breakpoints: BreakpointsState };

+const getBreakpointsState = (state: OuterState) => state.breakpoints;
+
 export function getBreakpointsMap(state: OuterState): BreakpointsMap {
   return state.breakpoints.breakpoints;
 }

-export function getBreakpointsList(state: OuterState): Breakpoint[] {
-  return (Object.values(getBreakpointsMap(state)): any);
-}
+// export function getBreakpointsList(state: OuterState): Breakpoint[] {
+//   return (Object.values(getBreakpointsMap(state)): any);
+// }
+
+export const getBreakpointsList: Selector<Breakpoint[]> = createSelector(
+  getBreakpointsState,
+  breakpoints => Object.values(breakpoints.breakpoints)
+);

 export function getBreakpointCount(state: OuterState): number {
   return getBreakpointsList(state).length;
diff --git a/devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js b/devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js
index a665e3d8c87f..255e2e9de389 100644
--- a/devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js
+++ b/devtools/client/debugger/new/src/selectors/visibleColumnBreakpoints.js
@@ -121,12 +121,13 @@ function formatPositions(
 export function getColumnBreakpoints(
   positions: ?BreakpointPositions,
   breakpoints: ?(Breakpoint[]),
-  viewport: Range,
+  // viewport: Range,
   selectedSource: ?Source
 ) {
   if (!positions) {
     return [];
   }
+  const viewport = {start: {line: 1, column: 1}, end: {line: 1000000, column: 1000000}}

   // We only want to show a column breakpoint if several conditions are matched
   // - it is the first breakpoint to appear at an the original location
@@ -153,7 +154,7 @@ export const visibleColumnBreakpoints: Selector<
 > = createSelector(
   getVisibleBreakpointPositions,
   getVisibleBreakpoints,
-  getViewport,
+  // getViewport,
   getSelectedSource,
   getColumnBreakpoints
 );