diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
index 8403609788..e2a8e1f3ae 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee
@@ -271,14 +271,6 @@ define [
 			cursor_offset = @_aceRangeToShareJs(selection.start)
 			entries = @_getCurrentDocEntries()
 
-			for id, entry of entries
-				if entry.type == "comment"
-					entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.length)
-				else if entry.type == "insert"
-					entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
-				else if entry.type == "delete"
-					entry.focused = (entry.offset == cursor_offset)
-
 			if selection.start.column == selection.end.column and selection.start.row == selection.end.row
 				# No selection
 				delete entries["add-comment"]
@@ -287,6 +279,16 @@ define [
 					type: "add-comment"
 					offset: cursor_offset
 				}
+
+			for id, entry of entries
+				if entry.type == "comment"
+					entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.length)
+				else if entry.type == "insert"
+					entry.focused = (entry.offset <= cursor_offset <= entry.offset + entry.content.length)
+				else if entry.type == "delete"
+					entry.focused = (entry.offset == cursor_offset)
+				else if entry.type == "add-comment" and !selection.isEmpty()
+					entry.focused = true
 		
 		updateEntryGeneration: () ->
 			# Rather than making angular deep watch the whole entries array
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index e0389e4d95..2a7b89c612 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -65,7 +65,7 @@
 		display: flex;
 		flex-direction: column;
 		width: @review-panel-width;
-		overflow: hidden;
+		overflow: visible;
 	}
 	.rp-size-mini & {
 		display: block;
@@ -178,8 +178,8 @@
 		width: auto;
 
 		&-focused {
-			left: 0px;
-			right: 10px;
+			left: -2px;
+			right: 12px;
 			z-index: 1;
 		}