diff --git a/src/AnnotationThread.js b/src/AnnotationThread.js
index 8923e659b..d07a9ac2c 100644
--- a/src/AnnotationThread.js
+++ b/src/AnnotationThread.js
@@ -87,8 +87,6 @@ class AnnotationThread extends EventEmitter {
         // $FlowFixMe
         this.renderAnnotationPopover = this.renderAnnotationPopover.bind(this);
         // $FlowFixMe
-        this.handleBlur = this.handleBlur.bind(this);
-        // $FlowFixMe
         this.onCommentClick = this.onCommentClick.bind(this);
         // $FlowFixMe
         this.save = this.save.bind(this);
@@ -453,7 +451,6 @@ class AnnotationThread extends EventEmitter {
         }
 
         this.element.addEventListener('click', this.renderAnnotationPopover);
-        this.element.addEventListener('blur', this.handleBlur);
     }
 
     /**
@@ -467,16 +464,6 @@ class AnnotationThread extends EventEmitter {
         }
 
         this.element.removeEventListener('click', this.renderAnnotationPopover);
-        this.element.removeEventListener('blur', this.handleBlur);
-    }
-
-    /**
-     * Called when the annotation element loses focus
-     *
-     * @return {void}
-     */
-    handleBlur() {
-        this.toggleFlippedThreadEl();
     }
 
     /**
diff --git a/src/components/AnnotationPopover/AnnotationPopover.scss b/src/components/AnnotationPopover/AnnotationPopover.scss
index 53ba5ed51..6510adbe5 100644
--- a/src/components/AnnotationPopover/AnnotationPopover.scss
+++ b/src/components/AnnotationPopover/AnnotationPopover.scss
@@ -75,15 +75,17 @@
     }
 
     .ba-popover-flipped {
-        path,
-        rect {
-            display: none;
-        }
-
         .ba-popover-caret {
             bottom: 0;
             transform: rotate(180deg);
         }
+
+        &.ba-point-annotation-marker {
+            path,
+            rect {
+                display: none;
+            }
+        }
     }
 
     // MOBILE & TABLET CSS