diff --git a/guh-control/main.cpp b/guh-control/main.cpp
index 13a39019..700283a7 100644
--- a/guh-control/main.cpp
+++ b/guh-control/main.cpp
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     application.setOrganizationName("guh");
 
     foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) {
-        int id = QFontDatabase::addApplicationFont(":/ui/fonts/OldaniaADFStd-Regular.otf");
+        int id = QFontDatabase::addApplicationFont(fi.absoluteFilePath());
         qDebug() << "Added font" << fi.absoluteFilePath() << QFontDatabase::applicationFontFamilies(id);
     }
 
diff --git a/guh-control/ui/ConnectPage.qml b/guh-control/ui/ConnectPage.qml
index ff1fdd6d..eb4446a0 100644
--- a/guh-control/ui/ConnectPage.qml
+++ b/guh-control/ui/ConnectPage.qml
@@ -164,7 +164,7 @@ Page {
             }
             Label {
                 Layout.fillWidth: true
-                wrapMode: Text.WordWrap
+                wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                 text: "Fingerprint: " + certDialog.fingerprint
             }
         }