diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 8d261eb..861e4aa 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -2378,6 +2378,12 @@
       // This will disable the FM radio device
       if (mReceiver != null)
       {
+         if(mReceiver.getFMState() == mReceiver.FMState_Srch_InProg) {
+             Log.d(LOGTAG, "Cancelling the on going search operation prior to disabling FM");
+             mEventReceived = false;
+             cancelSearch();
+             waitForEvent();
+         }
          mEventReceived = false;
          bStatus = mReceiver.disable(this);
          if (bStatus &&
@@ -3381,6 +3387,10 @@
             {
                mCallbacks.onSearchComplete();
             }
+            synchronized (mEventWaitLock) {
+               mEventReceived = true;
+               mEventWaitLock.notify();
+            }
             /* Update the frequency in the StatusBar's Notification */
             startNotification();
          }