diff --git a/assets/css/styles.scss b/assets/css/styles.scss
index 2df537e55..5e374d5bc 100644
--- a/assets/css/styles.scss
+++ b/assets/css/styles.scss
@@ -348,6 +348,10 @@ h3 {
   }
 
   &.popover {
+    .wrapper {
+      min-height: auto;
+    }
+
     .popover-inner {
       background: $bgcolor;
       color: $fgcolor;
@@ -616,6 +620,10 @@ ol li {
   display: flex;
 }
 
+.hide-on-large-screen {
+  display: none;
+}
+
 @media (max-width: $responsiveWidth) {
 
   ul,
@@ -632,6 +640,10 @@ ol li {
     display: none;
   }
 
+  .hide-on-large-screen {
+    display: inline-flex;
+  }
+
   .show-on-small-screen {
     display: inline-flex;
   }
diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index 8778ff895..34652dbe6 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -9,7 +9,7 @@
           <span>{{ collection.name }}</span>
         </button>
       </div>
-      <div>
+      <div class="hide-on-small-screen">
         <button
           class="icon"
           @click="removeCollection"
@@ -32,6 +32,46 @@
           <i class="material-icons">create_new_folder</i>
         </button>
       </div>
+      <v-popover class="hide-on-large-screen">
+        <button class="tooltip-target icon" v-tooltip="'More'">
+          <i class="material-icons">more_vert</i>
+        </button>
+        <template slot="popover">
+          <div>
+            <button
+              class="icon"
+              @click="removeCollection"
+              v-tooltip="'Delete collection'"
+              v-close-popover
+            >
+              <i class="material-icons">delete</i>
+              <span>Delete</span>
+            </button>
+          </div>
+          <div>
+            <button
+              class="icon"
+              @click="$emit('edit-collection')"
+              v-tooltip="'Edit collection'"
+              v-close-popover
+            >
+              <i class="material-icons">create</i>
+              <span>Edit</span>
+            </button>
+          </div>
+          <div>
+            <button
+              class="icon"
+              @click="$emit('add-folder')"
+              v-tooltip="'New Folder'"
+              v-close-popover
+            >
+              <i class="material-icons">create_new_folder</i>
+              <span>New folder</span>
+            </button>
+          </div>
+        </template>
+      </v-popover>
     </div>
 
     <div v-show="showChildren">
diff --git a/components/collections/folder.vue b/components/collections/folder.vue
index 18c791edc..0aeea9aae 100644
--- a/components/collections/folder.vue
+++ b/components/collections/folder.vue
@@ -9,7 +9,7 @@
           <span>{{ folder.name }}</span>
         </button>
       </div>
-      <div>
+      <div class="hide-on-small-screen">
         <button class="icon" @click="removeFolder" v-tooltip="'Delete folder'">
           <i class="material-icons">delete</i>
         </button>
@@ -17,6 +17,25 @@
           <i class="material-icons">edit</i>
         </button>
       </div>
+      <v-popover class="hide-on-large-screen">
+        <button class="tooltip-target icon" v-tooltip="'More'">
+          <i class="material-icons">more_vert</i>
+        </button>
+        <template slot="popover">
+          <div>
+            <button class="icon" @click="removeFolder" v-tooltip="'Delete folder'">
+              <i class="material-icons">delete</i>
+              <span>Delete</span>
+            </button>
+          </div>
+          <div>
+            <button class="icon" @click="editFolder" v-tooltip="'Edit folder'">
+              <i class="material-icons">edit</i>
+              <span>Edit</span>
+            </button>
+          </div>
+        </template>
+      </v-popover>
     </div>
 
     <div v-show="showChildren">
diff --git a/components/collections/request.vue b/components/collections/request.vue
index 22a9c51e9..59b8cae33 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -6,7 +6,7 @@
         <span>{{ request.name }}</span>
       </button>
     </div>
-    <div>
+    <div class="hide-on-small-screen">
       <button class="icon" @click="removeRequest" v-tooltip="'Delete request'">
         <i class="material-icons">delete</i>
       </button>
@@ -18,6 +18,29 @@
         <i class="material-icons">edit</i>
       </button>
     </div>
+    <v-popover class="hide-on-large-screen">
+      <button class="tooltip-target icon" v-tooltip="'More'">
+        <i class="material-icons">more_vert</i>
+      </button>
+      <template slot="popover">
+        <div>
+          <button class="icon" @click="removeRequest" v-tooltip="'Delete request'">
+            <i class="material-icons">delete</i>
+            <span>Delete</span>
+          </button>
+        </div>
+        <div>
+          <button
+            class="icon"
+            @click="$emit('edit-request')"
+            v-tooltip="'Edit request'"
+          >
+            <i class="material-icons">edit</i>
+            <span>Edit</span>
+          </button>
+        </div>
+      </template>
+    </v-popover>
   </div>
 </template>
 
diff --git a/layouts/default.vue b/layouts/default.vue
index 24002f1b2..8819ed2da 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -41,6 +41,7 @@
                   href="https://opencollective.com/postwoman"
                   target="_blank"
                   rel="noopener"
+                  v-close-popover
                 >
                   <button class="icon">
                     <i class="material-icons">favorite</i>
@@ -52,6 +53,7 @@
                 <button
                   class="icon"
                   onClick="window.open('https://twitter.com/share?text=👽 Postwoman • API request builder - Helps you create your requests faster, saving you precious time on your development&url=https://postwoman.io&hashtags=postwoman&via=liyasthomas');"
+                  v-close-popover
                 >
                   <svg
                     xmlns="http://www.w3.org/2000/svg"