diff --git a/fundingmanager.go b/fundingmanager.go
index 5ef93a384..6d46db4cb 100644
--- a/fundingmanager.go
+++ b/fundingmanager.go
@@ -1792,6 +1792,14 @@ func (f *fundingManager) handleFundingSigned(fmsg *fundingSignedMsg) {
 			}
 		}
 
+		err = f.handleFundingConfirmation(completeChan, *shortChanID)
+		if err != nil {
+			fndgLog.Errorf("unable to handle funding confirmation "+
+				"for ChannelPoint(%v): %v",
+				completeChan.FundingOutpoint, err)
+			return
+		}
+
 		fndgLog.Debugf("Channel with ShortChanID %v now confirmed",
 			shortChanID.ToUint64())
 
@@ -1873,6 +1881,16 @@ func (f *fundingManager) waitForFundingWithTimeout(completeChan *channeldb.OpenC
 				return
 			}
 
+			err = f.handleFundingConfirmation(
+				completeChan, *shortChanID,
+			)
+			if err != nil {
+				fndgLog.Errorf("unable to handle funding "+
+					"confirmation for ChannelPoint(%v): %v",
+					completeChan.FundingOutpoint, err)
+				return
+			}
+
 			select {
 			case confChan <- shortChanID:
 			case <-f.quit:
@@ -1990,12 +2008,6 @@ func (f *fundingManager) waitForFundingConfirmation(
 		TxPosition:  uint16(fundingPoint.Index),
 	}
 
-	err = f.handleFundingConfirmation(completeChan, shortChanID)
-	if err != nil {
-		fndgLog.Errorf("Unable to handle funding confirmation: %v", err)
-		return
-	}
-
 	select {
 	case confChan <- &shortChanID:
 	case <-f.quit: