diff --git a/terminus-core/src/components/renameTabModal.component.pug b/terminus-core/src/components/renameTabModal.component.pug
index 901ceb221976aaa1b31cb23ab465d1d69054b931..e595e8bbdf56a8d8a5c293f5b786296fd7345477 100644
--- a/terminus-core/src/components/renameTabModal.component.pug
+++ b/terminus-core/src/components/renameTabModal.component.pug
@@ -1,5 +1,5 @@
 .modal-body
-    input.form-control(type='text', [(ngModel)]='value', (keyup.enter)='save()', autofocus)
+    input.form-control(type='text', #input, [(ngModel)]='value', (keyup.enter)='save()', autofocus)
 
 .modal-footer
     button.btn.btn-outline-primary((click)='save()') Save
diff --git a/terminus-core/src/components/renameTabModal.component.ts b/terminus-core/src/components/renameTabModal.component.ts
index bbca5daa146d3cd72c75fa3dfc6964338cf2579b..a21105534b158805ced7027d2f9bfb90ae231186 100644
--- a/terminus-core/src/components/renameTabModal.component.ts
+++ b/terminus-core/src/components/renameTabModal.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core'
+import { Component, Input, ElementRef } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 
 @Component({
@@ -7,11 +7,18 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 })
 export class RenameTabModalComponent {
     @Input() value: string
+    @ViewChild('input') input: ElementRef
 
     constructor (
         private modalInstance: NgbActiveModal
     ) { }
 
+    ngOnInit () {
+        setTimeout(() => {
+            this.input.nativeElement.focus()
+        })
+    }
+
     save () {
         this.modalInstance.close(this.value)
     }