diff --git a/livesupport/src/modules/widgets/src/WhiteWindow.cxx b/livesupport/src/modules/widgets/src/WhiteWindow.cxx
index 5242d5e3a..550b33caa 100644
--- a/livesupport/src/modules/widgets/src/WhiteWindow.cxx
+++ b/livesupport/src/modules/widgets/src/WhiteWindow.cxx
@@ -440,8 +440,9 @@ WhiteWindow :: onResizeClicked(GdkEventButton     * event)  throw ()
                           (int) event->y_root,
                           event->time);
         return true;
+        
+    } else {
+        return false;
     }
-
-    return false;
 }
 
diff --git a/livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx b/livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx
index fbe8f2798..42493863b 100644
--- a/livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx
+++ b/livesupport/src/products/gLiveSupport/src/MasterPanelWindow.cxx
@@ -178,8 +178,6 @@ MasterPanelWindow :: MasterPanelWindow (Ptr<GLiveSupport>::Ref    gLiveSupport,
     move(0, 0);
     set_decorated(false);
     set_name(windowName);
-// need to make it focusable first
-//    set_focus(*nowPlayingWidget);
 
     // set the localized resources
     liveModeButton           = 0;