diff --git a/src/app/system-apps/filemanager/filemanager.component.css b/src/app/system-apps/filemanager/filemanager.component.css
index fbc956f5..ec4a5e85 100644
--- a/src/app/system-apps/filemanager/filemanager.component.css
+++ b/src/app/system-apps/filemanager/filemanager.component.css
@@ -138,12 +138,12 @@ span.tail{
 
 .rename-textbox{
     position: relative;
-    top: 1px;
-
+    top: 2px;
+    margin-bottom: 2px;
     max-width: 75px;
     max-height: 16px;
     border: 1px solid #333;
-    font-size: 12px;
+    font-size: 11.5px;
     z-index: 3;
     overflow:hidden;
     display: none;
diff --git a/src/app/system-apps/filemanager/filemanager.component.html b/src/app/system-apps/filemanager/filemanager.component.html
index 6b8c5b0b..8c746668 100644
--- a/src/app/system-apps/filemanager/filemanager.component.html
+++ b/src/app/system-apps/filemanager/filemanager.component.html
@@ -1,9 +1,9 @@
-<ol (dragover)="onDragOver($event)"  (drop)="onDrop($event)" (click)="hideIconContextMenu()" #myBounds>
+ <ol (dragover)="onDragOver($event)"  (drop)="onDrop($event)" (click)="hideIconContextMenu()"  #myBounds> 
     <li *ngFor="let file of files; let i = index">
         <button fileMngrHighlight (dblclick)="runProcess(file)"  
         ngDraggable [bounds]="myBounds" [inBounds]="true" [gridSize]="gridSize" zIndex="1" [preventDefaultEvent]="true"
         (stopped)="onDragEnd($event)" (started)="onDragStart($event)"
-        (contextmenu)="showIconContextMenu($event, file, i)" (click)="hideIconContextMenu()"
+        (contextmenu)="showIconContextMenu($event, file, i)" 
         id="iconBtn{{i}}"  [style]="btnStyle">
             <figure>
                 <img [src]="file.getIconPath | safeResourceUrl" [alt]="file.getFileName"  [style]="iconSizeStyle"/>
@@ -11,8 +11,8 @@
                         {{file.getFileName}}
                 </figcaption>
                 <div class="rename-textbox"  id="renameContainer{{i}}">
-                    <form [formGroup]="renameForm" (ngSubmit)="renameTheFile()"  id="renameTxtBox{{i}}">
-                        <input type="text" formControlName="renameInput" autofocus/>
+                    <form [formGroup]="renameForm" (ngSubmit)="renameFile()">
+                        <input type="text" formControlName="renameInput" autofocus spellcheck="false" id="renameTxtBox{{i}}"/>
                     </form>
                 </div>
             </figure>
@@ -20,57 +20,43 @@
     </li>
 
 
-<div class="icon-vertical-menu" [style]="iconCntxtMenuStyle">
-    <div class="empty-line-container"></div>
-
-    <div class="icon-vertical-menu-item" (click)="triggerRunProcess()">
-        <span class="span head"> <figure class="figure-cntxt-menu"> </figure></span>
-        <span class="span mid" style="font-weight: bold;">Open</span>
-        <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
-    </div>
-
-    <div class="icon-vertical-menu-item">
-        <span class="span head"> <figure class="figure-cntxt-menu"> </figure></span>
-        <span class="span mid">Pin to Start</span>
-        <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
-    </div>
-
-    <div class="icon-vertical-menu-item" >
-        <span class="span head"> <figure  class="figure-cntxt-menu"> </figure></span>
-        <span class="span mid">Pin to taskbar</span>
-        <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
-    </div>
-
-    <div class="empty-line-container"></div>
-    <div class="line-container"><div class="line"></div></div>
-    <div class="empty-line-container"></div>
-
-    <div class="icon-vertical-menu-item"(click)="deleteFile()">
-        <span class="span head"> <figure class="figure-cntxt-menu" > </figure></span>
-        <span class="span mid">Delete</span>
-        <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
-    </div>
-
-    <div class="icon-vertical-menu-item" (click)="renameFile()">
-        <span class="span head"> <figure class="figure-cntxt-menu" > </figure></span>
-        <span class="span mid">Rename</span>
-        <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+    <div class="icon-vertical-menu" [style]="iconCntxtMenuStyle">
+        <div class="empty-line-container"></div>
+
+        <div class="icon-vertical-menu-item" (click)="triggerRunProcess()">
+            <span class="span head"> <figure class="figure-cntxt-menu"> </figure></span>
+            <span class="span mid" style="font-weight: bold;">Open</span>
+            <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+        </div>
+
+        <div class="icon-vertical-menu-item">
+            <span class="span head"> <figure class="figure-cntxt-menu"> </figure></span>
+            <span class="span mid">Pin to Start</span>
+            <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+        </div>
+
+        <div class="icon-vertical-menu-item" >
+            <span class="span head"> <figure  class="figure-cntxt-menu"> </figure></span>
+            <span class="span mid">Pin to taskbar</span>
+            <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+        </div>
+
+        <div class="empty-line-container"></div>
+        <div class="line-container"><div class="line"></div></div>
+        <div class="empty-line-container"></div>
+
+        <div class="icon-vertical-menu-item"(click)="deleteFile()">
+            <span class="span head"> <figure class="figure-cntxt-menu" > </figure></span>
+            <span class="span mid">Delete</span>
+            <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+        </div>
+
+        <div class="icon-vertical-menu-item" (click)="triggerRenameFile()">
+            <span class="span head"> <figure class="figure-cntxt-menu" > </figure></span>
+            <span class="span mid">Rename</span>
+            <span class="span tail"> <figure class="figure-cntxt-menu"> </figure> </span>
+        </div>
+
+        <div class="empty-line-container"></div>
     </div>
-
-    <div class="empty-line-container"></div>
-</div>
 </ol>
-
-
-
-<!-- 
-<figcaption *ngIf="!isRenameMode, else elseBlock">
-    {{file.getFileName}}
-</figcaption>
-<ng-template #elseBlock>
-<div class="rename-textbox">
-    <form [formGroup]="renameForm" (ngSubmit)="renameTheFile()">
-      <input type="text" formControlName="renameInput" autofocus/>
-    </form>
-  </div>
-</ng-template> -->
\ No newline at end of file
diff --git a/src/app/system-apps/filemanager/filemanager.component.ts b/src/app/system-apps/filemanager/filemanager.component.ts
index a45ca5e7..3bd28de1 100644
--- a/src/app/system-apps/filemanager/filemanager.component.ts
+++ b/src/app/system-apps/filemanager/filemanager.component.ts
@@ -54,6 +54,7 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
   private autoArrange = false;
   private showDesktopIcon = true;
 
+  isRenameActive = false;
   private selectedFile!:FileInfo;
   renameForm!: FormGroup;
   elementId = -1;
@@ -154,6 +155,7 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
 
   triggerRunProcess():void{
     this.runProcess(this.selectedFile);
+    this.hideIconContextMenu();
   }
 
 
@@ -180,6 +182,9 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
       'z-index': -1,
       'opacity':0
     }
+
+    // if(this.isRenameActive)
+    //   this.renameFile();
   }
 
   onDragStart(evt:any):void{
@@ -294,11 +299,16 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
     //      return delFiles_el.getCurrentPath !== files_el.getCurrentPath;
     //   }).length == 0
     // });
+
+    this.hideIconContextMenu();
   }
 
-  renameFile():void{
+  triggerRenameFile():void{
+    this.isRenameActive = !this.isRenameActive;
+
     const figCapElement= document.getElementById(`figCap${this.elementId}`) as HTMLElement;
     const renameContainerElement= document.getElementById(`renameContainer${this.elementId}`) as HTMLElement;
+    const renameTxtBoxElement= document.getElementById(`renameTxtBox${this.elementId}`) as HTMLInputElement;
 
     if(figCapElement){
       figCapElement.style.display = 'none';
@@ -310,23 +320,28 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
       this.renameForm.setValue({
         renameInput:' '+ this.selectedFile.getFileName
       })
+
+      renameTxtBoxElement?.focus();
+      renameTxtBoxElement?.select();
     }
 
+    this.hideIconContextMenu();
   }
 
-  renameTheFile():void{
-    console.log('I will change the File Name to this:', this.renameForm.value.renameInput);
+  renameFile():void{
+
+    const btnElement = document.getElementById(`iconBtn${this.elementId}`) as HTMLElement;
+    const figCapElement= document.getElementById(`figCap${this.elementId}`) as HTMLElement;
+    const renameContainerElement= document.getElementById(`renameContainer${this.elementId}`) as HTMLElement;
 
     const renameText = this.renameForm.value.renameInput as string
+    console.log('I will change the File Name to this:', this.renameForm.value.renameInput);
 
     if( renameText === '' || renameText.trimStart().length == 0)
       return;
 
     this._fileService.renameFileAsync(this.selectedFile.getCurrentPath, renameText.trimStart());
-    
-    const btnElement = document.getElementById(`iconBtn${this.elementId}`) as HTMLElement;
-    const figCapElement= document.getElementById(`figCap${this.elementId}`) as HTMLElement;
-    const renameContainerElement= document.getElementById(`renameContainer${this.elementId}`) as HTMLElement;
+
 
     if(btnElement){
       btnElement.style.backgroundColor = 'hsl(206deg 77% 70%/20%)';
@@ -340,6 +355,8 @@ export class FilemanagerComponent implements  OnInit, AfterViewInit, OnDestroy {
     if(renameContainerElement){
       renameContainerElement.style.display = 'none';
     }
+
+    this.elementId = -1;
   }