diff --git a/components/collections/collection.vue b/components/collections/collection.vue
index f6f411423..c7284f409 100644
--- a/components/collections/collection.vue
+++ b/components/collections/collection.vue
@@ -37,6 +37,7 @@
                     <request 
                         :request="request"
                         :collection-index="collectionIndex"
+                        :folder-index="-1"
                         :request-index="index"
                     ></request>
                 </li>
diff --git a/components/collections/request.vue b/components/collections/request.vue
index 921ef74e1..f48300e8e 100644
--- a/components/collections/request.vue
+++ b/components/collections/request.vue
@@ -1,6 +1,7 @@
 <template>
     <div @click='selectRequest()'>
         {{request.name}}
+        <button class="add-button" @click="editRequest">e</button>
         <button class="add-button" @click="removeRequest">x</button>
     </div>
 </template>
@@ -27,6 +28,10 @@ export default {
         selectRequest() {
             this.$store.commit('postwoman/selectRequest', { request: this.request });
         },
+        editRequest() {
+            this.request.requestIndex = this.requestIndex;
+            this.$store.commit('postwoman/editRequest', { request: this.request });
+        },
         removeRequest() {
             if (!confirm("Are you sure you want to remove this request?")) return;
             this.$store.commit('postwoman/removeRequest', {
diff --git a/components/collections/saveRequest.vue b/components/collections/saveRequest.vue
index 1e8a1704f..b29b432fb 100644
--- a/components/collections/saveRequest.vue
+++ b/components/collections/saveRequest.vue
@@ -8,9 +8,9 @@
                             <h3 class="title" v-if='!request.hasOwnProperty("requestIndex")'>Add New Request</h3>
                             <h3 class="title" v-if='request.hasOwnProperty("requestIndex")'>Edit Request</h3>
                             <div>
-                            <button class="icon" @click="hideModel">
-                                <i class="material-icons">close</i>
-                            </button>
+                                <button class="icon" @click="hideModel">
+                                    <i class="material-icons">close</i>
+                                </button>
                             </div>
                         </div>
                     </li>
@@ -63,7 +63,7 @@ export default {
             request: {
                 name: '',
                 collection: '',
-                folder: '',
+                folder: -1,
             },
         }
     },
@@ -110,7 +110,7 @@ export default {
             const savedRequest = Object.assign({}, this.request);
 
             this.$store.commit('postwoman/saveRequest', {
-                savedRequest,
+                request: savedRequest,
             });
 
             this.request = {
diff --git a/pages/index.vue b/pages/index.vue
index 586603505..6289d1783 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -3,7 +3,7 @@
     <save-request
       v-bind:show="showRequestModal"
       v-on:hide-model='hideRequestModal'
-      v-bind:editing-request='request'
+      v-bind:editing-request='editRequest'
     ></save-request>
     <pw-modal v-if="showModal" @close="showModal = false">
       <div slot="header">
@@ -490,7 +490,7 @@
           'text/plain'
         ],
         showRequestModal: false,
-        request: {},
+        editRequest: {},
       }
     },
     watch: {
@@ -547,28 +547,36 @@
         deep: true
       },
       selectedRequest (newValue, oldValue) {
+        // @TODO: Convert all variables to single request variable
         if (!newValue) return;
         this.url = newValue.url;
-        this.path = '/api/users';
+        this.path = newValue.path;
         this.method = newValue.method;
-        this.auth = 'None';
-        this.httpUser = '';
-        this.httpPassword = '';
-        // passwordFieldType: 'password',
-        // bearerToken: '',
-        // headers: [],
-        // params: [],
-        // bodyParams: [],
-        // rawParams: '',
-        // rawInput: false,
-        // contentType: 'application/json',
-        // requestType: 'JavaScript XHR',
+        this.auth = newValue.auth;
+        this.httpUser = newValue.httpUser;
+        this.httpPassword = newValue.httpPassword;
+        this.passwordFieldType = newValue.passwordFieldType;
+        this.bearerToken = newValue.bearerToken;
+        this.headers = newValue.headers;
+        this.params = newValue.params;
+        this.bodyParams = newValue.bodyParams;
+        this.rawParams = newValue.rawParams;
+        this.rawInput = newValue.rawInput;
+        this.contentType = newValue.contentType;
+        this.requestType = newValue.requestType;
       },
+      editingRequest (newValue) {
+        this.editRequest = newValue;
+        this.showRequestModal = true;
+      }
     },
     computed: {
       selectedRequest() {
         return this.$store.state.postwoman.selectedRequest;
       },
+      editingRequest() {
+        return this.$store.state.postwoman.editingRequest;
+      },
       requestName() {
         return this.label
       },
@@ -1123,7 +1131,7 @@
         });
       },
       saveRequest() {
-        this.request = {
+        this.editRequest = {
           url: this.url,
           path: this.path,
           method: this.method,
@@ -1139,11 +1147,13 @@
           rawInput: this.rawInput,
           contentType: this.contentType,
           requestType: this.requestType,
-        }
+        };
+        console.log(this.editRequest);
         this.showRequestModal = true;
       },
       hideRequestModal() {
         this.showRequestModal = false;
+        this.editRequest = {};
       },
     },
     mounted() {
diff --git a/store/postwoman.js b/store/postwoman.js
index 4176e3234..eb7a36659 100644
--- a/store/postwoman.js
+++ b/store/postwoman.js
@@ -49,6 +49,7 @@ export const state = () => ({
         requests: [],
     }],
     selectedRequest: {},
+    editingRequest: {},
 });
 
 export const mutations = {
@@ -100,7 +101,7 @@ export const mutations = {
         const { request } = payload;
         
         // Request that is directly attached to collection
-        if (!request.folder) {
+        if (request.folder === -1) {
             state.collections[request.collection].requests.push(request);
             return
         }
@@ -112,7 +113,7 @@ export const mutations = {
         const { request } = payload;
         
         // Request that is directly attached to collection
-        if (!request.folder) {
+        if (request.folder === -1) {
             state.collections[request.collection].requests[request.requestIndex] = request;
             return
         }
@@ -124,7 +125,7 @@ export const mutations = {
         const { collectionIndex, folderIndex, requestIndex } = payload;
 
         // Request that is directly attached to collection
-        if (!folderIndex) {
+        if (folderIndex === -1) {
             state.collections[collectionIndex].requests.splice(requestIndex, 1)
             return
         }
@@ -134,6 +135,10 @@ export const mutations = {
 
     selectRequest (state, payload) {
         state.selectedRequest = Object.assign({}, payload.request);
-    }
+    },
+
+    editRequest (state, payload) {
+        state.editingRequest = Object.assign({}, payload.request);
+    },
 
 };