diff --git a/src/components/forms/Input.vue b/src/components/forms/Input.vue
index 37634ba1..d9c8f02a 100644
--- a/src/components/forms/Input.vue
+++ b/src/components/forms/Input.vue
@@ -118,7 +118,7 @@ export default {
     },
     baseClass: {
       type: String,
-      default: 'block w-full bg-tw-white text-tw-gray-700 shadow-sm disabled:cursor-not-allowed disabled:bg-tw-gray-50 focus:outline-none'
+      default: 'block w-full bg-tw-white text-tw-gray-700 disabled:cursor-not-allowed disabled:bg-tw-gray-50 focus:outline-none'
     },
     customClass: {
       type: String,
@@ -175,7 +175,7 @@ export default {
     })[props.size])
 
     const appearanceClass = computed(() => ({
-      default: 'focus:ring-1 focus:ring-primary-500 focus:border-primary-500 border border-tw-gray-300 rounded-md',
+      default: 'focus:ring-1 focus:ring-primary-500 focus:border-primary-500 border border-tw-gray-300 rounded-md shadow-sm',
       none: 'border-0 bg-transparent focus:ring-0 focus:shadow-none'
     })[props.appearance])
 
diff --git a/src/components/forms/Select.vue b/src/components/forms/Select.vue
index 52105b6b..b8801b53 100644
--- a/src/components/forms/Select.vue
+++ b/src/components/forms/Select.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="relative" :class="wrapperClass">
+  <div :class="wrapperClass">
     <select
       :id="name"
       :name="name"
@@ -84,18 +84,18 @@ export default {
         return ['xxs', 'xs', 'sm', 'md', 'lg', 'xl'].includes(value)
       }
     },
+    wrapperClass: {
+      type: String,
+      default: 'relative'
+    },
     baseClass: {
       type: String,
-      default: 'block w-full disabled:cursor-not-allowed bg-tw-white text-tw-gray-700 disabled:bg-tw-gray-50 focus:ring-primary-500 focus:border-primary-500 dark:focus:border-primary-500 border border-tw-gray-300 rounded-md focus:outline-none'
+      default: 'block w-full disabled:cursor-not-allowed bg-tw-white text-tw-gray-700 disabled:bg-tw-gray-50 focus:ring-1 focus:ring-primary-500 focus:border-primary-500 dark:focus:border-primary-500 border border-tw-gray-300 rounded-md shadow-sm focus:outline-none'
     },
     customClass: {
       type: String,
       default: null
     },
-    noShadow: {
-      type: Boolean,
-      default: false
-    },
     textAttribute: {
       type: String,
       default: 'text'
@@ -159,13 +159,6 @@ export default {
         this.paddingClass
       ].join(' ')
     },
-    wrapperClass () {
-      return [
-        'relative',
-        'rounded-md',
-        !this.noShadow ? 'shadow-sm' : ''
-      ].filter(Boolean).join(' ')
-    },
     normalizedOptions () {
       return this.options.map(option => this.normalizeOption(option))
     },
diff --git a/src/components/forms/Textarea.vue b/src/components/forms/Textarea.vue
index e36bbbde..19e84c05 100644
--- a/src/components/forms/Textarea.vue
+++ b/src/components/forms/Textarea.vue
@@ -84,7 +84,7 @@ export default {
     },
     baseClass: {
       type: String,
-      default: 'block w-full bg-tw-white text-tw-gray-700 shadow-sm disabled:cursor-not-allowed disabled:bg-tw-gray-50 focus:outline-none'
+      default: 'block w-full bg-tw-white text-tw-gray-700 disabled:cursor-not-allowed disabled:bg-tw-gray-50 focus:outline-none'
     },
     customClass: {
       type: String,
@@ -147,7 +147,7 @@ export default {
     })[props.size])
 
     const appearanceClass = computed(() => ({
-      default: 'focus:ring-1 focus:ring-primary-500 focus:border-primary-500 border border-tw-gray-300 rounded-md',
+      default: 'focus:ring-1 focus:ring-primary-500 focus:border-primary-500 border border-tw-gray-300 rounded-md shadow-sm',
       none: 'border-0 bg-transparent focus:ring-0 focus:shadow-none'
     })[props.appearance])