diff --git a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
index 4505602..701dc71 100755
--- a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
+++ b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.html
@@ -16,14 +16,15 @@
 
       <!-- Right Group: ENTER, COPY, CLEAR, PR -->
       <div class="d-flex flex-wrap justify-content-center gap-2 second">
-        <button
-          *ngIf="showShashEnter"
-          class="btn btn-dark"
-[disabled]="twoGroupLabels.includes(selectedLabel || '') && isFirstGroupComplete"
-          (click)="padEnter()"
-        >
-          shash ENTER
-        </button>
+       <button
+  *ngIf="showShashEnter"
+  class="btn btn-dark"
+  [disabled]="isShashEnterDisabled"
+  (click)="onShashEnter()"
+>
+  shash ENTER
+</button>
+
         <button class="btn btn-dark">COPY</button>
 
   <button class="btn btn-danger btn-bkp" *ngIf="showBackspace" (click)="removeLastNumber()">BKP</button>
@@ -96,7 +97,7 @@
             </ng-container>
 
             <div class="col-6">
-              <button class="btn btn-secondary w-100 number-button" [disabled]="!numericPadEnabled" (click)="padEnter()">Enter</button>
+<button class="btn btn-secondary w-100 number-button" [disabled]="!numericPadEnabled" (click)="onPadEnter()">Enter</button>
             </div>
             <div class="col-6">
               <button class="btn btn-secondary w-100 number-button" [disabled]="!canPrint" (click)="print()">Print</button>
diff --git a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
index 884439d..9e2675c 100755
--- a/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
+++ b/btc-UI/src/app/components/touch-pad-menu/touch-pad-menu.component.ts
@@ -1,3 +1,4 @@
+// ... same imports
 import { Component, Input, OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { SelectionService } from '../selection.service/selection.service';
@@ -162,7 +163,14 @@ export class TouchPadMenuComponent implements OnInit {
     return this.selectedNumbers.includes(number);
   }
 
-  padEnter() {
+  // 👉 Changed from padEnter to split into two handlers
+  onPadEnter() {
+    if (this.canPrint) {
+      this.print();
+    }
+  }
+
+  onShashEnter() {
     if (this.selectedLabel === 'TAN') {
       if (this.tanGroupStage < 2) {
         this.tanGroupStage++;
@@ -183,8 +191,6 @@ export class TouchPadMenuComponent implements OnInit {
         this.selectionService.updatePartial({ numbers: [...this.selectedNumbers] });
         return;
       }
-    } else if (this.canPrint) {
-      this.print();
     }
   }