diff --git a/tp-button.js b/tp-button.js
index 7d4379d..560325a 100644
--- a/tp-button.js
+++ b/tp-button.js
@@ -123,8 +123,8 @@ class TpButton extends EventHelpers(LitElement) {
 
   render() {
     return html`
-      <div class="wrap">
-        <div class="label">
+      <div class="wrap" part="wrap">
+        <div class="label" part="label">
           <slot></slot>
         </div>
         ${this.extended ? html`
@@ -200,6 +200,10 @@ class TpButton extends EventHelpers(LitElement) {
     this.unlisten(this, 'keypress', '_keyPressed');
   }
 
+  firstUpdated() {
+    this.listen(this, 'keypress', '_keyPressed');
+  }
+
   shouldUpdate(changes) {
     if (changes.has('submit') && this.submit) {
       this.extended = true;