diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/ShowHideMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/ShowHideMixin.py
index d34bba2..49b29d8 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/ShowHideMixin.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/ShowHideMixin.py
@@ -110,6 +110,9 @@ class ShowHideMixin:
 
 
     def show_edit_file_menu(self, widget=None, eve=None):
+        if widget:
+            widget.grab_focus()
+
         response = self.edit_file_menu.run()
         if response == Gtk.ResponseType.CLOSE:
             self.skip_edit   = True
diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py
index d2f92fe..f53a991 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py
@@ -123,7 +123,7 @@ class WidgetFileActionMixin:
             rename_label.set_label(entry)
             rename_input.set_text(entry)
 
-            self.show_edit_file_menu()
+            self.show_edit_file_menu(rename_input)
             if self.skip_edit:
                 self.skip_edit   = False
                 continue
diff --git a/user_config/solarfm/Main_Window.glade b/user_config/solarfm/Main_Window.glade
index d829f34..471f6c9 100644
--- a/user_config/solarfm/Main_Window.glade
+++ b/user_config/solarfm/Main_Window.glade
@@ -623,8 +623,15 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
   </object>
   <object class="GtkDialog" id="new_file_menu">
     <property name="can-focus">False</property>
+    <property name="type">popup</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
     <property name="window-position">center</property>
+    <property name="destroy-with-parent">True</property>
     <property name="type-hint">splashscreen</property>
+    <property name="skip-taskbar-hint">True</property>
+    <property name="skip-pager-hint">True</property>
+    <property name="deletable">False</property>
     <property name="gravity">center</property>
     <signal name="focus-out-event" handler="hide_new_file_menu" swapped="no"/>
     <child internal-child="vbox">
@@ -776,9 +783,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
   <object class="GtkDialog" id="file_exists_dialog">
     <property name="height-request">120</property>
     <property name="can-focus">False</property>
+    <property name="type">popup</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window-position">center</property>
+    <property name="destroy-with-parent">True</property>
     <property name="type-hint">splashscreen</property>
     <property name="skip-taskbar-hint">True</property>
     <property name="skip-pager-hint">True</property>
@@ -1092,6 +1101,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
   </object>
   <object class="GtkDialog" id="edit_file_menu">
     <property name="can-focus">False</property>
+    <property name="type">popup</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window-position">center</property>
@@ -1276,7 +1286,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
         <property name="orientation">vertical</property>
         <property name="baseline-position">top</property>
         <child>
-          <object class="GtkBox">
+          <object class="GtkBox" id="top_main_menubar">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <child>