diff --git a/app/src/components/globals/formItems/index.js b/app/src/components/globals/formItems/index.js
deleted file mode 100644
index 8857af8f..00000000
--- a/app/src/components/globals/formItems/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as FormItemHelper } from './FormItemHelper'
-
-export { default as InputItem } from './InputItem'
-export { default as SelectItem } from './SelectItem'
-export { default as CheckboxItem } from './CheckboxItem'
diff --git a/app/src/components/globals/index.js b/app/src/components/globals/index.js
deleted file mode 100644
index eefbb66d..00000000
--- a/app/src/components/globals/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as Icon } from './Icon'
-export { default as Breadcrumb } from './Breadcrumb'
-export { FormItemHelper, InputItem, SelectItem, CheckboxItem } from './formItems'
diff --git a/app/src/main.js b/app/src/main.js
index 8329e43a..eda9a955 100644
--- a/app/src/main.js
+++ b/app/src/main.js
@@ -6,17 +6,20 @@ import i18n from './i18n'
 import router from './router'
 import store from './store'
 
-import * as globalsComponents from './components/globals'
-
 Vue.config.productionTip = false
 
 // Styles are imported in `src/App.vue` <style>
 Vue.use(BootstrapVue)
 
 // Register global components
-for (const component of Object.values(globalsComponents)) {
+const requireComponent = require.context('@/components/globals', true, /\.(js|vue)$/i)
+// For each matching file name...
+requireComponent.keys().forEach((fileName) => {
+  // Get the component
+  const component = requireComponent(fileName).default
+  // Globally register the component
   Vue.component(component.name, component)
-}
+})
 
 new Vue({
   i18n,