2 files changed, 13 insertions, 2 deletions

diff --git a/data/mat.ui b/data/mat.ui
index 0724676..5ed4e7e 100644
--- a/data/mat.ui
+++ b/data/mat.ui
@@ -335,6 +335,7 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="deletable">False</property>
+    <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="can_focus">False</property>
@@ -432,6 +433,7 @@
     <property name="skip_pager_hint">True</property>
     <property name="deletable">False</property>
     <property name="has_resize_grip">False</property>
+    <signal name="delete-event" handler="cb_hide_widget" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkBox" id="supported_vbox">
         <property name="can_focus">False</property>
diff --git a/mat-gui b/mat-gui
index 1be21b7..9290804 100755
--- a/mat-gui
+++ b/mat-gui
@@ -102,6 +102,13 @@ class GUI(object):
         targets.add_uri_targets(80)
         self.treeview.drag_dest_set_target_list(targets)
 
+    def cb_hide_widget(self, widget, _):
+        ''' This function is a little hack to hide instead
+        of close re-usable popups, like supported-fileformats,
+        popup-metadata, ...'''
+        widget.hide()
+        return False
+
     def cb_update_supported_popup(self, window):
         '''
             Fill GtkEntries of the supported_format_popups
@@ -206,6 +213,7 @@ class GUI(object):
         ''' Preferences popup '''
         dialog = Gtk.Dialog(_('Preferences'), self.window, 0,
                 (Gtk.STOCK_OK, 0))
+        dialog.connect('delete-event', self.cb_hide_widget)
         dialog.set_resizable(False)
         dialog.set_deletable(False)
         hbox = Gtk.HBox()
@@ -322,6 +330,7 @@ non-anonymised) file to output archive'))
         '''
         dialog = Gtk.Dialog(title=_('Not-supported'), parent=self.window,
                 flags=0, buttons=(Gtk.STOCK_OK, 0))
+        dialog.set_modal(True)
         dialog.set_size_request(220, 180)
         vbox = Gtk.VBox(spacing=5)
         sc = Gtk.ScrolledWindow()
@@ -350,8 +359,8 @@ non-anonymised) file to output archive'))
         treeview.append_column(column)
 
         dialog.show_all()
-        if not dialog.run():  # Ok button
-            dialog.destroy()
+        dialog.run()
+        dialog.destroy()
 
     def __mat_check(self, iterator):
         ''' Check elements in iterator are clean '''