diff --git a/src/App.js b/src/App.js
index 041e131a..61b5eec1 100644
--- a/src/App.js
+++ b/src/App.js
@@ -12,7 +12,6 @@ import MobilePostStatusButton from './components/mobile_post_status_button/mobil
 import MobileNav from './components/mobile_nav/mobile_nav.vue'
 import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
-import PopoverTarget from './components/popover/popover_target.vue'
 import { windowWidth } from './services/window_utils/window_utils'
 
 export default {
@@ -31,8 +30,7 @@ export default {
     MobilePostStatusButton,
     MobileNav,
     UserReportingModal,
-    PostStatusModal,
-    PopoverTarget
+    PostStatusModal
   },
   data: () => ({
     mobileActivePanel: 'timeline',
diff --git a/src/App.vue b/src/App.vue
index de15802f..1b1c2648 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -123,7 +123,6 @@
     <UserReportingModal />
     <PostStatusModal />
     <portal-target name="modal" />
-    <PopoverTarget />
   </div>
 </template>
 
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index d2153680..5d7ecf7e 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,4 +1,5 @@
 import ProgressButton from '../progress_button/progress_button.vue'
+import Popover from '../popover/popover.vue'
 
 const AccountActions = {
   props: [
@@ -8,7 +9,8 @@ const AccountActions = {
     return { }
   },
   components: {
-    ProgressButton
+    ProgressButton,
+    Popover
   },
   methods: {
     showRepeats () {
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index d3235be1..1fd00a1e 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="account-actions">
-    <v-popover
+    <Popover
       trigger="click"
-      class="account-tools-popover"
-      :container="false"
-      placement="bottom-end"
-      :offset="5"
+      placement="bottom"
     >
-      <div slot="popover">
+      <div
+        slot="content"
+        class="account-tools-popover"
+      >
         <div class="dropdown-menu">
           <template v-if="user.following">
             <button
@@ -51,10 +51,13 @@
           </button>
         </div>
       </div>
-      <div class="btn btn-default ellipsis-button">
+      <div
+        slot="trigger"
+        class="btn btn-default ellipsis-button"
+      >
         <i class="icon-ellipsis trigger-button" />
       </div>
-    </v-popover>
+    </Popover>
   </div>
 </template>
 
@@ -67,6 +70,9 @@
   margin: 0 .8em;
 }
 
+.account-tools-popover {
+}
+
 .account-actions button.dropdown-item {
   margin-left: 0;
 }
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index b799ac9a..bd2ec826 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -1,11 +1,13 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
+import Popover from '../popover/popover.vue'
 
 const EMOJI_REACTION_COUNT_CUTOFF = 12
 
 const EmojiReactions = {
   name: 'EmojiReactions',
   components: {
-    UserAvatar
+    UserAvatar,
+    Popover
   },
   props: ['status'],
   data: () => ({
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index e5b6d9f5..1a00054c 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -1,15 +1,14 @@
 <template>
   <div class="emoji-reactions">
-    <v-popover
+    <Popover
       v-for="(reaction) in emojiReactions"
       :key="reaction.name"
-      :popper-options="popperOptions"
       trigger="hover"
       placement="top"
+      :offset="{ y: 5 }"
     >
-
       <div
-        slot="popover"
+        slot="content"
         class="reacted-users"
       >
         <div v-if="accountsForEmoji[reaction.name].length">
@@ -34,6 +33,7 @@
         </div>
       </div>
       <button
+        slot="trigger"
         class="emoji-reaction btn btn-default"
         :class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
@@ -42,7 +42,7 @@
         <span class="reaction-emoji">{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
-    </v-popover>
+    </Popover>
     <a
         v-if="tooManyReactions"
         @click="toggleShowAll"
@@ -78,6 +78,7 @@
     display: flex;
     flex-direction: column;
     margin-left: 0.5em;
+    min-width: 5em;
 
     img {
       width: 1em;
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 3f003425..f03112aa 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -47,7 +47,10 @@
         </button>
       </div>
     </div>
-    <div slot="trigger" class="button-icon">
+    <div
+      slot="trigger"
+      class="button-icon"
+    >
       <i class="icon-ellipsis" />
     </div>
   </Popover>
@@ -59,10 +62,6 @@
 @import '../../_variables.scss';
 @import '../popper/popper.scss';
 
-.dropdown-menu {
-  flex-shrink: 0;
-}
-
 .icon-ellipsis {
   cursor: pointer;
 
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 4ee08323..5918008f 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -4,7 +4,10 @@ const Popover = {
   props: [
     'trigger',
     'placement',
-    'show'
+    'boundTo',
+    'padding',
+    'offset',
+    'popoverClass'
   ],
   data () {
     return {
@@ -31,55 +34,77 @@ const Popover = {
       }
     },
     */
+    updateStyles () {
+      if (this.hidden) return { opacity: 0 }
+
+      // Popover will be anchored around this element
+      const anchorEl = this.$refs.trigger || this.$el
+      const screenBox = anchorEl.getBoundingClientRect()
+      // Screen position of the origin point for popover
+      const origin = { x: screenBox.left + screenBox.width * 0.5, y: screenBox.top }
+      const content = this.$refs.content
+      const parentBounds = this.boundTo === 'container' && this.$el.offsetParent.getBoundingClientRect()
+      const padding = this.padding || {}
+      const bounds = this.boundTo === 'container'
+        ? {
+          xMin: parentBounds.left + (padding.left || 0),
+          xMax: parentBounds.right - (padding.right || 0),
+          yMin: 0 + (padding.top || 50),
+          yMax: window.innerHeight - (padding.bottom || 5)
+        } : {
+          xMin: 0 + (padding.left || 10),
+          xMax: window.innerWidth - (padding.right || 10),
+          yMin: 0 + (padding.top || 50),
+          yMax: window.innerHeight - (padding.bottom || 5)
+        }
+      let horizOffset = 0
+
+      console.log(bounds, content.offsetWidth)
+
+      // If overflowing from left, move it
+      if ((origin.x - content.offsetWidth * 0.5) < bounds.xMin) {
+        horizOffset = -(origin.x - content.offsetWidth * 0.5) + bounds.xMin
+      }
+
+      // If overflowing from right, move it
+      if ((origin.x + horizOffset + content.offsetWidth * 0.5) > bounds.xMax) {
+        horizOffset -= (origin.x + horizOffset + content.offsetWidth * 0.5) - bounds.xMax
+      }
+
+      // Default to whatever user wished with placement prop
+      let usingTop = this.placement !== 'bottom'
+
+      // Handle special cases, first force to displaying on top if there's not space on bottom,
+      // regardless of what placement value was. Then check if there's not space on top, and
+      // force to bottom, again regardless of what placement value was.
+      if (origin.y + content.offsetHeight > bounds.yMax) usingTop = true
+      if (origin.y - content.offsetHeight < bounds.yMin) usingTop = false
+
+      const yOffset = (this.offset && this.offset.y) || 0
+      const vertAlign = usingTop
+        ? {
+          bottom: `${anchorEl.offsetHeight + yOffset}px`
+        }
+        : {
+          top: `${anchorEl.offsetHeight + yOffset}px`
+        }
+      this.styles = {
+        opacity: '100%',
+        left: `${(anchorEl.offsetLeft + anchorEl.offsetWidth * 0.5) - content.offsetWidth * 0.5 + horizOffset}px`,
+        ...vertAlign
+      }
+    },
     showPopover () {
+      if (this.hidden) this.$emit('show')
       this.hidden = false
-      this.$nextTick(function () {
-        if (this.hidden) return { opacity: 0 }
-
-        const anchorEl = this.$refs.trigger || this.$el
-        console.log(anchorEl)
-        const screenBox = anchorEl.getBoundingClientRect()
-        const origin = { x: screenBox.left + screenBox.width * 0.5, y: screenBox.top}
-        const content = this.$refs.content
-        let horizOffset = 0
-
-        if ((origin.x - content.offsetWidth * 0.5) < 25) {
-          horizOffset += -(origin.x - content.offsetWidth * 0.5) + 25
-        }
-
-        console.log((origin.x + content.offsetWidth * 0.5), (window.innerWidth - 25))
-        if ((origin.x + content.offsetWidth * 0.5) > window.innerWidth - 25) {
-          horizOffset -= (origin.x + content.offsetWidth * 0.5) - (window.innerWidth - 25)
-        }
-        // Default to whatever user wished with placement prop
-        let usingTop = this.placement !== 'bottom'
-
-        // Handle special cases, first force to displaying on top if there's not space on bottom,
-        // regardless of what placement value was. Then check if there's not space on top, and
-        // force to bottom, again regardless of what placement value was.
-        if (origin.y + content.offsetHeight > (window.innerHeight - 25)) usingTop = true
-        if (origin.y - content.offsetHeight < 50) usingTop = false
-
-        const vertAlign = usingTop ?
-          {
-            bottom: `${anchorEl.offsetHeight}px`
-          } :
-          {
-            top: `${anchorEl.offsetHeight}px`
-          }
-        this.styles = {
-          opacity: '100%',
-          left: `${(anchorEl.offsetLeft + anchorEl.offsetWidth * 0.5) - content.offsetWidth * 0.5 + horizOffset}px`,
-          ...vertAlign
-        }
-      })
+      this.$nextTick(this.updateStyles)
     },
     hidePopover () {
+      if (!this.hidden) this.$emit('close')
       this.hidden = true
       this.styles = { opacity: 0 }
     },
     onMouseenter (e) {
-      console.log(this.trigger)
       if (this.trigger === 'hover') this.showPopover()
     },
     onMouseleave (e) {
@@ -97,15 +122,18 @@ const Popover = {
     onClickOutside (e) {
       if (this.hidden) return
       if (this.$el.contains(e.target)) return
-      console.log(e.target)
       this.hidePopover()
     }
   },
+  beforeUpdate () {
+    console.log('beforeupdate')
+    // if (!this.hidden) this.$nextTick(this.updateStyles)
+  },
   created () {
-    document.addEventListener("click", this.onClickOutside)
+    document.addEventListener('click', this.onClickOutside)
   },
   destroyed () {
-    document.removeEventListener("click", this.onClickOutside)
+    document.removeEventListener('click', this.onClickOutside)
     this.hidePopover()
   }
 }
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 273a0a69..d376f609 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -1,40 +1,26 @@
 <template>
-  <!-- This is for the weird portal shit
-  <div
-    @mouseenter="registerPopover"
-    @mouseleave="unregisterPopover"
-  >
-    <slot name="trigger"></slot>
-    <portal
-      v-if="targetId"
-      :to="targetId"
-    >
-      <slot name="content"></slot>
-    </portal>
-  </div>
-  -->
   <div
     @mouseenter="onMouseenter"
     @mouseleave="onMouseleave"
   >
-    <div @click="onClick" ref="trigger">
-      <slot name="trigger"></slot>
+    <div
+      ref="trigger"
+      @click="onClick"
+    >
+      <slot name="trigger" />
     </div>
     <div
       v-if="display"
+      ref="content"
       :style="styles"
       class="popover"
+      :class="popoverClass"
     >
-      <div
-        ref="content"
+      <slot
+        name="content"
         class="popover-inner"
-      >
-      <!-- onSuccess is to mimic basic functionality of v-popover -->
-        <slot
-          name="content"
-          @onSuccess="hidePopover"
-        ></slot>
-      </div>
+        :close="hidePopover"
+      />
     </div>
   </div>
 </template>
@@ -48,15 +34,14 @@
   z-index: 8;
   position: absolute;
   min-width: 0;
+  transition: opacity 0.3s;
 
-  .popover-inner {
-    box-shadow: 1px 1px 4px rgba(0,0,0,.6);
-    box-shadow: var(--panelShadow);
-    border-radius: $fallback--btnRadius;
-    border-radius: var(--btnRadius, $fallback--btnRadius);
-    background-color: $fallback--bg;
-    background-color: var(--bg, $fallback--bg);
-  }
+  box-shadow: 1px 1px 4px rgba(0,0,0,.6);
+  box-shadow: var(--panelShadow);
+  border-radius: $fallback--btnRadius;
+  border-radius: var(--btnRadius, $fallback--btnRadius);
+  background-color: $fallback--bg;
+  background-color: var(--bg, $fallback--bg);
 
   .popover-arrow {
     width: 0;
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index a6cf5b94..19949563 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -1,34 +1,25 @@
+import Popover from '../popover/popover.vue'
 import { mapGetters } from 'vuex'
 
 const ReactButton = {
   props: ['status', 'loggedIn'],
   data () {
     return {
-      showTooltip: false,
-      filterWord: '',
-      popperOptions: {
-        modifiers: {
-          preventOverflow: { padding: { top: 50 }, boundariesElement: 'viewport' }
-        }
-      }
+      filterWord: ''
     }
   },
+  components: {
+    Popover
+  },
   methods: {
-    openReactionSelect () {
-      this.showTooltip = true
-      this.filterWord = ''
-    },
-    closeReactionSelect () {
-      this.showTooltip = false
-    },
-    addReaction (event, emoji) {
+    addReaction (event, emoji, close) {
       const existingReaction = this.status.emoji_reactions.find(r => r.name === emoji)
       if (existingReaction && existingReaction.me) {
         this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
       } else {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
-      this.closeReactionSelect()
+      close()
     }
   },
   computed: {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index fb43ebaf..8613143f 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -1,13 +1,13 @@
 <template>
-  <v-popover
-    :popper-options="popperOptions"
-    :open="showTooltip"
-    trigger="manual"
+  <Popover
+    trigger="click"
     placement="top"
     class="react-button-popover"
-    @hide="closeReactionSelect"
   >
-    <div slot="popover">
+    <div
+      slot="content"
+      slot-scope="{close}"
+    >
       <div class="reaction-picker-filter">
         <input
           v-model="filterWord"
@@ -19,7 +19,7 @@
           v-for="emoji in commonEmojis"
           :key="emoji"
           class="emoji-button"
-          @click="addReaction($event, emoji)"
+          @click="addReaction($event, emoji, close)"
         >
           {{ emoji }}
         </span>
@@ -28,7 +28,7 @@
           v-for="(emoji, key) in emojis"
           :key="key"
           class="emoji-button"
-          @click="addReaction($event, emoji.replacement)"
+          @click="addReaction($event, emoji.replacement, close)"
         >
           {{ emoji.replacement }}
         </span>
@@ -37,14 +37,14 @@
     </div>
     <div
       v-if="loggedIn"
-      @click.prevent="openReactionSelect"
+      slot="trigger"
     >
       <i
         class="icon-smile button-icon add-reaction-button"
         :title="$t('tool_tip.add_reaction')"
       />
     </div>
-  </v-popover>
+  </Popover>
 </template>
 
 <script src="./react_button.js" ></script>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 83f07dac..66959251 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -177,6 +177,8 @@
                 <StatusPopover
                   v-if="!isPreview"
                   :status-id="status.in_reply_to_status_id"
+                  class="reply-to-popover"
+                  style="min-width: 0"
                 >
                   <a
                     class="reply-to"
@@ -564,11 +566,10 @@ $status-margin: 0.75em;
       align-items: stretch;
 
       > .reply-to-and-accountname > a {
+        overflow: hidden;
         max-width: 100%;
         text-overflow: ellipsis;
-        overflow: hidden;
         white-space: nowrap;
-        display: inline-block;
         word-break: break-all;
       }
     }
@@ -577,7 +578,6 @@ $status-margin: 0.75em;
       display: flex;
       height: 18px;
       margin-right: 0.5em;
-      overflow: hidden;
       max-width: 100%;
       .icon-reply {
         transform: scaleX(-1);
@@ -588,6 +588,10 @@ $status-margin: 0.75em;
       display: flex;
     }
 
+    .reply-to-popover {
+      min-width: 0;
+    }
+
     .reply-to {
       display: flex;
     }
@@ -595,6 +599,7 @@ $status-margin: 0.75em;
     .reply-to-text {
       overflow: hidden;
       text-overflow: ellipsis;
+      white-space: nowrap;
       margin: 0 0.4em 0 0.2em;
       color: $fallback--faint;
       color: var(--faint, $fallback--faint);
diff --git a/src/components/status_popover/status_popover.js b/src/components/status_popover/status_popover.js
index 4055e5cb..35baac3e 100644
--- a/src/components/status_popover/status_popover.js
+++ b/src/components/status_popover/status_popover.js
@@ -5,15 +5,6 @@ const StatusPopover = {
   props: [
     'statusId'
   ],
-  data () {
-    return {
-      popperOptions: {
-        modifiers: {
-          preventOverflow: { padding: { top: 50 }, boundariesElement: 'viewport' }
-        }
-      }
-    }
-  },
   computed: {
     status () {
       return find(this.$store.state.statuses.allStatuses, { id: this.statusId })
@@ -28,6 +19,7 @@ const StatusPopover = {
       if (!this.status) {
         this.$store.dispatch('fetchStatus', this.statusId)
       }
+      console.log(this.$el.offsetParent)
     }
   }
 }
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index 9f37e4e7..04de1e34 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -1,9 +1,16 @@
 <template>
-  <Popover trigger="hover">
+  <Popover
+    trigger="hover"
+    bound-to="container"
+    popover-class="status-popover"
+    @show="enter"
+  >
     <template slot="trigger">
       <slot />
     </template>
-    <div slot="content" class="status-popover">
+    <div
+      slot="content"
+    >
       <Status
         v-if="status"
         :is-preview="true"
@@ -31,16 +38,14 @@
   max-width: 95%;
   margin: 0.5em 0;
 
-  .popover-inner {
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
-    border-style: solid;
-    border-width: 1px;
-    border-radius: $fallback--tooltipRadius;
-    border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-    box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
-    box-shadow: var(--popupShadow);
-  }
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+  border-style: solid;
+  border-width: 1px;
+  border-radius: $fallback--tooltipRadius;
+  border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
+  box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
+  box-shadow: var(--popupShadow);
 
   .popover-arrow::before {
     position: absolute;
diff --git a/src/main.js b/src/main.js
index d74ff63a..baf73ac8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,7 +19,6 @@ import oauthTokensModule from './modules/oauth_tokens.js'
 import reportsModule from './modules/reports.js'
 import pollsModule from './modules/polls.js'
 import postStatusModule from './modules/postStatus.js'
-import popoverModule from './modules/popover.js'
 
 import VueI18n from 'vue-i18n'
 
@@ -90,8 +89,7 @@ const persistedStateOptions = {
       oauthTokens: oauthTokensModule,
       reports: reportsModule,
       polls: pollsModule,
-      postStatus: postStatusModule,
-      popover: popoverModule
+      postStatus: postStatusModule
     },
     plugins: [persistedState, pushNotifications],
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/popover.js b/src/modules/popover.js
deleted file mode 100644
index 5b01ccbb..00000000
--- a/src/modules/popover.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { omit } from 'lodash'
-import { set } from 'vue'
-
-const popover = {
-  state: {
-    popovers: {}
-  },
-  mutations: {
-    registerPopover (state, { id, el }) {
-      set(state.popovers, id, el)
-    },
-    unregisterPopover (state, { id }) {
-      state.popovers = omit(state.popovers, id)
-    }
-  },
-  actions: {
-    registerPopover (store, el) {
-      // Generate unique id, it will be used to link portal and portal-target
-      // popover-target will make portal targets for each registered popover
-      // el will be used by popover target to put popovers in their places.
-      let id = Math.floor(Math.random() * 1000000).toString()
-      store.commit('registerPopover', { id, el })
-      return id
-    },
-    unregisterPopover (store, id) {
-      store.commit('unregisterPopover', { id })
-    }
-  }
-}
-
-export default popover