diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
index 5a8f6956b..86b1ed292 100644
--- a/qml/ui/configpopup/ConfigPopup.qml
+++ b/qml/ui/configpopup/ConfigPopup.qml
@@ -207,6 +207,7 @@ Rectangle {
                 // On localhost, QOpenHD "automatically" connects due to udp localhost method
                 ConfigPopupSidebarButton{
                     id:  connect_button
+                    visible: !_ohdSystemAir.is_alive && !_ohdSystemGround.is_alive
                     m_icon_text: "\uf6ff"
                     m_description_text: "Connect"
                     m_selection_index: 5
diff --git a/qml/ui/configpopup/credits/Credits.qml b/qml/ui/configpopup/credits/Credits.qml
index e94fd4231..cd0907504 100644
--- a/qml/ui/configpopup/credits/Credits.qml
+++ b/qml/ui/configpopup/credits/Credits.qml
@@ -17,11 +17,7 @@ Rectangle {
     color: "#eaeaea"
 
     RowLayout {
-        anchors.topMargin: 24
-        anchors.left: parent.left
-        anchors.leftMargin: 20
-        spacing: 6
-        height: 300
+        anchors.centerIn: parent
 
         ColumnLayout {
             spacing: 6
@@ -53,6 +49,7 @@ Rectangle {
             }
 
             Card {
+                visible: false
                 id: thomas
                 height: 224
                 width: 150
@@ -167,6 +164,7 @@ Rectangle {
 
             Card {
                 id: you
+                visible: false
                 height: 224
                 width: 150
                 cardName: qsTr("")