Provided that you have some small current flowing through the sense resistor, you could theoretically add two schottky diodes in parallel to the sense resistor. The diode connected to the higher supply voltage would always take precedence because of the voltage drop caused by the sense resistor.
