diff --git a/src/renderer/components/BaseContextMenu.vue b/src/renderer/components/BaseContextMenu.vue
index b200f74c..de104281 100644
--- a/src/renderer/components/BaseContextMenu.vue
+++ b/src/renderer/components/BaseContextMenu.vue
@@ -69,75 +69,81 @@ export default {
 </script>
 
 <style lang="scss">
-  .context {
+.context {
+  display: flex;
+  color: $body-font-color;
+  font-size: 16px;
+  z-index: 400;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  position: fixed;
+  height: 100vh;
+  right: 0;
+  top: 0;
+  left: 0;
+  bottom: 0;
+
+  .context-container {
+    min-width: 100px;
+    z-index: 10;
+    box-shadow: 0 0 2px 0 #000;
+    padding: 0;
+    background: #1d1d1d;
+    border-radius: 0.1rem;
     display: flex;
-    color: $body-font-color;
-    font-size: 16px;
-    z-index: 400;
-    justify-content: center;
-    align-items: center;
-    overflow: hidden;
-    position: fixed;
-    height: 100vh;
-    right: 0;
-    top: 0;
-    left: 0;
-    bottom: 0;
+    flex-direction: column;
+    position: absolute;
+    pointer-events: initial;
 
-    .context-container {
-      min-width: 100px;
-      z-index: 10;
-      box-shadow: 0 0 2px 0 #000;
-      padding: 0;
-      background: #1d1d1d;
-      border-radius: 0.1rem;
+    .context-element {
       display: flex;
-      flex-direction: column;
-      position: absolute;
-      pointer-events: initial;
+      align-items: center;
+      padding: 0.1rem 0.3rem;
+      cursor: pointer;
+      justify-content: space-between;
+      position: relative;
 
-      .context-element {
-        display: flex;
-        align-items: center;
-        padding: 0.1rem 0.3rem;
-        cursor: pointer;
-        justify-content: space-between;
-        position: relative;
+      .context-submenu {
+        opacity: 0;
+        visibility: hidden;
+        transition: opacity 0.2s;
+        position: absolute;
+        left: 100%;
+        top: 0;
+        background: #1d1d1d;
+        box-shadow: 0 0 2px 0 #000;
+        min-width: 100px;
+      }
+
+      &:hover {
+        background: $primary-color;
 
         .context-submenu {
-          opacity: 0;
-          visibility: hidden;
-          transition: opacity 0.2s;
-          position: absolute;
-          left: 100%;
-          top: 0;
-          background: #1d1d1d;
-          box-shadow: 0 0 2px 0 #000;
-          min-width: 100px;
-        }
-
-        &:hover {
-          background: $primary-color;
-
-          .context-submenu {
-            display: block;
-            visibility: visible;
-            opacity: 1;
-          }
+          display: block;
+          visibility: visible;
+          opacity: 1;
         }
       }
     }
-
-    .context-overlay {
-      background: transparent;
-      bottom: 0;
-      cursor: default;
-      display: block;
-      left: 0;
-      position: absolute;
-      right: 0;
-      top: 0;
-    }
   }
 
+  .context-overlay {
+    background: transparent;
+    bottom: 0;
+    cursor: default;
+    display: block;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+}
+
+.disabled {
+  pointer-events: none;
+  filter: grayscale(100%);
+  opacity: 0.5;
+}
+
 </style>
diff --git a/src/renderer/components/ModalNewRoutine.vue b/src/renderer/components/ModalNewRoutine.vue
new file mode 100644
index 00000000..f99a4017
--- /dev/null
+++ b/src/renderer/components/ModalNewRoutine.vue
@@ -0,0 +1,147 @@
+<template>
+   <ConfirmModal
+      :confirm-text="$t('word.confirm')"
+      size="400"
+      @confirm="confirmNewRoutine"
+      @hide="$emit('close')"
+   >
+      <template :slot="'header'">
+         <div class="d-flex">
+            <i class="mdi mdi-24px mdi-cogs mr-1" /> {{ $t('message.createNewRoutine') }}
+         </div>
+      </template>
+      <div :slot="'body'">
+         <form class="form-horizontal">
+            <div class="form-group">
+               <label class="form-label col-4">
+                  {{ $t('word.name') }}
+               </label>
+               <div class="column">
+                  <input
+                     ref="firstInput"
+                     v-model="localRoutine.name"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label col-4">
+                  {{ $t('word.definer') }}
+               </label>
+               <div class="column">
+                  <select
+                     v-if="workspace.users.length"
+                     v-model="localRoutine.definer"
+                     class="form-select"
+                  >
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                     <option
+                        v-for="user in workspace.users"
+                        :key="`${user.name}@${user.host}`"
+                        :value="`\`${user.name}\`@\`${user.host}\``"
+                     >
+                        {{ user.name }}@{{ user.host }}
+                     </option>
+                  </select>
+                  <select v-if="!workspace.users.length" class="form-select">
+                     <option value="">
+                        {{ $t('message.currentUser') }}
+                     </option>
+                  </select>
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label col-4">
+                  {{ $t('word.comment') }}
+               </label>
+               <div class="column">
+                  <input
+                     v-model="localRoutine.comment"
+                     class="form-input"
+                     type="text"
+                  >
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label col-4">
+                  {{ $t('message.sqlSecurity') }}
+               </label>
+               <div class="column">
+                  <select v-model="localRoutine.security" class="form-select">
+                     <option>DEFINER</option>
+                     <option>INVOKER</option>
+                  </select>
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label col-4">
+                  {{ $t('message.dataAccess') }}
+               </label>
+               <div class="column">
+                  <select v-model="localRoutine.dataAccess" class="form-select">
+                     <option>CONTAINS SQL</option>
+                     <option>NO SQL</option>
+                     <option>READS SQL DATA</option>
+                     <option>MODIFIES SQL DATA</option>
+                  </select>
+               </div>
+            </div>
+            <div class="form-group">
+               <div class="col-4" />
+               <div class="column">
+                  <label class="form-checkbox form-inline">
+                     <input v-model="localRoutine.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
+                  </label>
+               </div>
+            </div>
+         </form>
+      </div>
+   </ConfirmModal>
+</template>
+
+<script>
+import ConfirmModal from '@/components/BaseConfirmModal';
+
+export default {
+   name: 'ModalNewRoutine',
+   components: {
+      ConfirmModal
+   },
+   props: {
+      workspace: Object
+   },
+   data () {
+      return {
+         localRoutine: {
+            definer: '',
+            sql: 'BEGIN\r\n\r\nEND',
+            parameters: [],
+            name: '',
+            comment: '',
+            security: 'DEFINER',
+            deterministic: false,
+            dataAccess: 'CONTAINS SQL'
+         },
+         isOptionsChanging: false
+      };
+   },
+   computed: {
+      schema () {
+         return this.workspace.breadcrumbs.schema;
+      }
+   },
+   mounted () {
+      setTimeout(() => {
+         this.$refs.firstInput.focus();
+      }, 20);
+   },
+   methods: {
+      confirmNewRoutine () {
+         this.$emit('open-create-routine-editor', this.localRoutine);
+      }
+   }
+};
+</script>
diff --git a/src/renderer/components/ModalNewTrigger.vue b/src/renderer/components/ModalNewTrigger.vue
index dcec2233..f1d9fa14 100644
--- a/src/renderer/components/ModalNewTrigger.vue
+++ b/src/renderer/components/ModalNewTrigger.vue
@@ -2,7 +2,7 @@
    <ConfirmModal
       :confirm-text="$t('word.confirm')"
       size="400"
-      @confirm="confirmOptionsChange"
+      @confirm="confirmNewTrigger"
       @hide="$emit('close')"
    >
       <template :slot="'header'">
@@ -132,7 +132,7 @@ export default {
       }, 20);
    },
    methods: {
-      confirmOptionsChange () {
+      confirmNewTrigger () {
          this.$emit('open-create-trigger-editor', this.localTrigger);
       }
    }
diff --git a/src/renderer/components/WorkspaceExploreBar.vue b/src/renderer/components/WorkspaceExploreBar.vue
index 9bb214e4..a6629389 100644
--- a/src/renderer/components/WorkspaceExploreBar.vue
+++ b/src/renderer/components/WorkspaceExploreBar.vue
@@ -67,6 +67,12 @@
          @close="hideCreateTriggerModal"
          @open-create-trigger-editor="openCreateTriggerEditor"
       />
+      <ModalNewRoutine
+         v-if="isNewRoutineModal"
+         :workspace="workspace"
+         @close="hideCreateRoutineModal"
+         @open-create-routine-editor="openCreateRoutineEditor"
+      />
       <DatabaseContext
          v-if="isDatabaseContext"
          :selected-database="selectedDatabase"
@@ -75,6 +81,7 @@
          @show-create-table-modal="showCreateTableModal"
          @show-create-view-modal="showCreateViewModal"
          @show-create-trigger-modal="showCreateTriggerModal"
+         @show-create-routine-modal="showCreateRoutineModal"
          @reload="refresh"
       />
       <TableContext
@@ -97,9 +104,12 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import _ from 'lodash';// TODO: remove
+
 import Tables from '@/ipc-api/Tables';
 import Views from '@/ipc-api/Views';
 import Triggers from '@/ipc-api/Triggers';
+import Routines from '@/ipc-api/Routines';
+
 import WorkspaceConnectPanel from '@/components/WorkspaceConnectPanel';
 import WorkspaceExploreBarDatabase from '@/components/WorkspaceExploreBarDatabase';
 import DatabaseContext from '@/components/WorkspaceExploreBarDatabaseContext';
@@ -109,6 +119,7 @@ import ModalNewDatabase from '@/components/ModalNewDatabase';
 import ModalNewTable from '@/components/ModalNewTable';
 import ModalNewView from '@/components/ModalNewView';
 import ModalNewTrigger from '@/components/ModalNewTrigger';
+import ModalNewRoutine from '@/components/ModalNewRoutine';
 
 export default {
    name: 'WorkspaceExploreBar',
@@ -121,7 +132,8 @@ export default {
       ModalNewDatabase,
       ModalNewTable,
       ModalNewView,
-      ModalNewTrigger
+      ModalNewTrigger,
+      ModalNewRoutine
    },
    props: {
       connection: Object,
@@ -135,6 +147,7 @@ export default {
          isNewTableModal: false,
          isNewViewModal: false,
          isNewTriggerModal: false,
+         isNewRoutineModal: false,
 
          localWidth: null,
          isDatabaseContext: false,
@@ -308,6 +321,29 @@ export default {
          }
          else
             this.addNotification({ status: 'error', message: response });
+      },
+      showCreateRoutineModal () {
+         this.closeDatabaseContext();
+         this.isNewRoutineModal = true;
+      },
+      hideCreateRoutineModal () {
+         this.isNewRoutineModal = false;
+      },
+      async openCreateRoutineEditor (payload) {
+         const params = {
+            uid: this.connection.uid,
+            ...payload
+         };
+
+         const { status, response } = await Routines.createRoutine(params);
+
+         if (status === 'success') {
+            await this.refresh();
+            this.changeBreadcrumbs({ schema: this.selectedDatabase, procedure: payload.name });
+            this.selectTab({ uid: this.workspace.uid, tab: 'prop' });
+         }
+         else
+            this.addNotification({ status: 'error', message: response });
       }
    }
 };
diff --git a/src/renderer/components/WorkspaceExploreBarDatabaseContext.vue b/src/renderer/components/WorkspaceExploreBarDatabaseContext.vue
index 19cf1194..dfcc92d3 100644
--- a/src/renderer/components/WorkspaceExploreBarDatabaseContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarDatabaseContext.vue
@@ -16,13 +16,13 @@
             <div class="context-element" @click="showCreateTriggerModal">
                <span class="d-flex"><i class="mdi mdi-18px mdi-table-cog text-light pr-1" /> {{ $tc('word.trigger', 1) }}</span>
             </div>
-            <div class="context-element" @click="false">
+            <div class="context-element" @click="showCreateRoutineModal">
                <span class="d-flex"><i class="mdi mdi-18px mdi-sync-circle pr-1" /> {{ $tc('word.storedRoutine', 1) }}</span>
             </div>
-            <div class="context-element" @click="false">
+            <div class="context-element disabled" @click="false">
                <span class="d-flex"><i class="mdi mdi-18px mdi-arrow-right-bold-box pr-1" /> {{ $tc('word.function', 1) }}</span>
             </div>
-            <div class="context-element" @click="false">
+            <div class="context-element disabled" @click="false">
                <span class="d-flex"><i class="mdi mdi-18px mdi-calendar-clock text-light pr-1" /> {{ $tc('word.scheduler', 1) }}</span>
             </div>
          </div>
@@ -105,6 +105,9 @@ export default {
       showCreateTriggerModal () {
          this.$emit('show-create-trigger-modal');
       },
+      showCreateRoutineModal () {
+         this.$emit('show-create-routine-modal');
+      },
       showDeleteModal () {
          this.isDeleteModal = true;
       },
diff --git a/src/renderer/components/WorkspaceExploreBarMiscContext.vue b/src/renderer/components/WorkspaceExploreBarMiscContext.vue
index 05efaf6e..9203134d 100644
--- a/src/renderer/components/WorkspaceExploreBarMiscContext.vue
+++ b/src/renderer/components/WorkspaceExploreBarMiscContext.vue
@@ -4,11 +4,11 @@
       @close-context="closeContext"
    >
       <div
-         v-if="selectedMisc.type === 'table'"
-         class="context-element"
-         @click="showEmptyModal"
+         v-if="selectedMisc.type === 'procedure'"
+         class="context-element disabled"
+         @click="showRunModal"
       >
-         <span class="d-flex"><i class="mdi mdi-18px mdi-table-off text-light pr-1" /> {{ $t('message.emptyTable') }}</span>
+         <span class="d-flex"><i class="mdi mdi-18px mdi-play text-light pr-1" /> {{ $t('word.run') }}</span>
       </div>
       <div class="context-element" @click="showDeleteModal">
          <span class="d-flex"><i class="mdi mdi-18px mdi-table-remove text-light pr-1" /> {{ $t('word.delete') }}</span>
@@ -52,7 +52,7 @@ export default {
    data () {
       return {
          isDeleteModal: false,
-         isEmptyModal: false
+         isRunModal: false
       };
    },
    computed: {
@@ -88,11 +88,11 @@ export default {
       hideDeleteModal () {
          this.isDeleteModal = false;
       },
-      showEmptyModal () {
-         this.isEmptyModal = true;
+      showRunModal () {
+         this.isRunModal = true;
       },
-      hideEmptyModal () {
-         this.isEmptyModal = false;
+      hideRunModal () {
+         this.isRunModal = false;
       },
       closeContext () {
          this.$emit('close-context');
diff --git a/src/renderer/components/WorkspacePropsTabRoutine.vue b/src/renderer/components/WorkspacePropsTabRoutine.vue
index 6c4cd8d6..a5d0675f 100644
--- a/src/renderer/components/WorkspacePropsTabRoutine.vue
+++ b/src/renderer/components/WorkspacePropsTabRoutine.vue
@@ -25,7 +25,7 @@
                <div class="divider-vert py-3" />
 
                <button
-                  class="btn btn-dark btn-sm"
+                  class="btn btn-dark btn-sm disabled"
                   :disabled="isChanged"
                   @click="false"
                >
diff --git a/src/renderer/components/WorkspacePropsTableContext.vue b/src/renderer/components/WorkspacePropsTableContext.vue
index 9d6f3545..fe71fde6 100644
--- a/src/renderer/components/WorkspacePropsTableContext.vue
+++ b/src/renderer/components/WorkspacePropsTableContext.vue
@@ -77,11 +77,3 @@ export default {
    }
 };
 </script>
-
-<style lang="scss" scoped>
-.disabled {
-  pointer-events: none;
-  filter: grayscale(100%);
-  opacity: 0.5;
-}
-</style>
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
index d4e93d9f..babb9024 100644
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -157,6 +157,7 @@ module.exports = {
       dataAccess: 'Data access',
       thereAreNoParameters: 'There are no parameters',
       createNewParameter: 'Create new parameter',
+      createNewRoutine: 'Create new stored routine',
       deleteRoutine: 'Delete stored routine'
    },
    // Date and Time