1 files changed, 10 insertions, 0 deletions
diff --git a/main/src/ui/util/label_hybrid.vala b/main/src/ui/util/label_hybrid.vala
index a16bccf7..ab765dd1 100644
--- a/main/src/ui/util/label_hybrid.vala
+++ b/main/src/ui/util/label_hybrid.vala
@@ -20,6 +20,7 @@ public class LabelHybrid : Stack {
 
     public void show_widget() {
         visible_child_name = "widget";
+        get_child_by_name("widget").grab_focus();
     }
 
     public void show_label() {
@@ -86,6 +87,10 @@ public class EntryLabelHybrid : LabelHybrid {
             }
             return false;
         });
+        entry.focus_out_event.connect(() => {
+            show_label();
+            return false;
+        });
     }
 
     private void update_label() {
@@ -134,6 +139,11 @@ public class ComboBoxTextLabelHybrid : LabelHybrid {
             update_label();
             show_label();
         });
+        combobox.focus_out_event.connect(() => {
+            update_label();
+            show_label();
+            return false;
+        });
         button.clicked.connect(() => {
             combobox.popup();
         });