diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m
index 08467e3a8..7eceffcc8 100644
--- a/Classes/ConferenceCallDetailView.m
+++ b/Classes/ConferenceCallDetailView.m
@@ -76,6 +76,7 @@ NSTimer *callQualityRefresher;
     [table reloadData];
     [mute reset];
     [speaker reset];
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
 }
 
 -(void) viewDidAppear:(BOOL)animated {
@@ -87,6 +88,8 @@ NSTimer *callQualityRefresher;
 }
 
 -(void) viewDidDisappear:(BOOL)animated {
+    [[UIApplication sharedApplication] setIdleTimerDisabled:NO];
+    
 	if (callQualityRefresher != nil) {
         [callQualityRefresher invalidate];
         callQualityRefresher=nil;
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index a0d43dce3..9fa171804 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -247,6 +247,7 @@ int callCount(LinphoneCore* lc) {
 -(void) viewWillAppear:(BOOL)animated {}
 
 -(void)viewDidAppear:(BOOL)animated {
+    [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
     [super viewDidAppear:animated];
 	if (dismissed) {
         [self dismissModalViewControllerAnimated:true];
diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m
index da2455057..4fc041da2 100644
--- a/Classes/PhoneViewController.m
+++ b/Classes/PhoneViewController.m
@@ -77,7 +77,6 @@
 }
 
 - (void)viewDidAppear:(BOOL)animated {
-	[[UIApplication sharedApplication] setIdleTimerDisabled:true];
 	if ([[NSUserDefaults standardUserDefaults] boolForKey:@"enable_first_login_view_preference"] == true) {
 		myFirstLoginViewController = [[FirstLoginViewController alloc]  initWithNibName:@"FirstLoginViewController" 
 																				 bundle:[NSBundle mainBundle]];