diff --git a/mythtv/libs/libmythtv/channelbase.cpp b/mythtv/libs/libmythtv/channelbase.cpp
index 8c31420..f90a117 100644
--- a/mythtv/libs/libmythtv/channelbase.cpp
+++ b/mythtv/libs/libmythtv/channelbase.cpp
@@ -549,6 +549,7 @@ vector<InputInfo> ChannelBase::GetFreeInputs(
     const vector<uint> &excluded_cardids) const
 {
     vector<InputInfo> new_list;
+    bool anybusy = false;

     QStringList list = GetConnectedInputs();
     if (list.empty())
@@ -592,10 +593,22 @@ vector<InputInfo> ChannelBase::GetFreeInputs(
             info.inputid, groupids, excluded_cardids,
             busygrp, busyrec, busyin, info.mplexid);

+        if (is_busy_grp && info.livetvorder)
+            anybusy = true;
+
         if (!is_busy_grp && info.livetvorder)
             new_list.push_back(info);
     }

+    // If any inputs are busy and the user prefers a completely free
+    // card for live TV, penalize all inputs to make sure they will
+    // come after those on free cards.
+    if (anybusy && gCoreContext->GetSetting("PreferFreeCardForLiveTV", 0))
+    {
+        for (uint i = 0; i < new_list.size(); ++i)
+            new_list[i].livetvorder += 100;
+    }
+
     return new_list;
 }