diff --git a/components/inplace/Inplace.spec.js b/components/inplace/Inplace.spec.js
index 23d0a132a..add7f5de4 100644
--- a/components/inplace/Inplace.spec.js
+++ b/components/inplace/Inplace.spec.js
@@ -60,7 +60,7 @@ describe('Inplace.vue', () => {
             },
             slots: {
                 display: `{{'Click to Edit'}}`,
-                content: `<InputText autoFocus />`
+                content: `<InputText autofocus />`
             }
         });
 
@@ -90,7 +90,7 @@ describe('Inplace.vue', () => {
             },
             slots: {
                 display: `{{'Click to Edit'}}`,
-                content: `<InputText autoFocus />`
+                content: `<InputText autofocus />`
             }
         });
 
diff --git a/components/inplace/Inplace.vue b/components/inplace/Inplace.vue
index 3bd1cc6b8..67c21dfd4 100755
--- a/components/inplace/Inplace.vue
+++ b/components/inplace/Inplace.vue
@@ -1,5 +1,5 @@
 <template>
-    <div :class="containerClass" aria-live="polite">
+    <div v-focustrap :class="containerClass" aria-live="polite">
         <div v-if="!d_active" ref="display" :class="displayClass" :tabindex="$attrs.tabindex || '0'" role="button" @click="open" @keydown.enter="open" v-bind="displayProps">
             <slot name="display"></slot>
         </div>
@@ -12,6 +12,7 @@
 
 <script>
 import Button from 'primevue/button';
+import FocusTrap from 'primevue/focustrap';
 
 export default {
     name: 'Inplace',
@@ -84,6 +85,9 @@ export default {
     },
     components: {
         IPButton: Button
+    },
+    directives: {
+        focustrap: FocusTrap
     }
 };
 </script>