diff --git a/src/fapp.cpp b/src/fapp.cpp
index 4e5288ff..ee099bfb 100644
--- a/src/fapp.cpp
+++ b/src/fapp.cpp
@@ -1064,7 +1064,7 @@ void FApplication::processMouseEvent()
     }
   }
   flush_out();
-  
+
 #ifdef HAVE_LIBGPM
   if ( gpm_mouse_enabled && gpm_ev.x != -1 )
     GPM_DRAWPOINTER(&gpm_ev);
diff --git a/src/fcheckbox.cpp b/src/fcheckbox.cpp
index 0aadb39e..ba5c3800 100644
--- a/src/fcheckbox.cpp
+++ b/src/fcheckbox.cpp
@@ -34,6 +34,7 @@ void FCheckBox::init()
 {
   label_offset_pos = 4;
   button_width = 4;
+  setVisibleCursor();
 }
 
 //----------------------------------------------------------------------
diff --git a/src/fmenulist.h b/src/fmenulist.h
index 35169878..5b43855b 100644
--- a/src/fmenulist.h
+++ b/src/fmenulist.h
@@ -11,7 +11,7 @@
     ┌─────────┐       ┌──────────┐
     │ FWindow │◄───┬──┤ FMenuBar │
     └─────────┘    │  └──────────┘
-  ┌───────────┐◄───┘  ┌───────────┐ 
+  ┌───────────┐◄───┘  ┌───────────┐
   │ FMenuList ├-------┤ FMenuItem │
   └───────────┘◄───┐  └───────────┘
     ┌─────────┐    │  ┌────────────┐
diff --git a/src/fradiobutton.cpp b/src/fradiobutton.cpp
index 75cdf5c5..5f803891 100644
--- a/src/fradiobutton.cpp
+++ b/src/fradiobutton.cpp
@@ -35,6 +35,7 @@ void FRadioButton::init()
 {
   label_offset_pos = 4;
   button_width = 4;
+  setVisibleCursor();
 }
 
 //----------------------------------------------------------------------
diff --git a/src/fswitch.cpp b/src/fswitch.cpp
index 4fafc072..7669e78e 100644
--- a/src/fswitch.cpp
+++ b/src/fswitch.cpp
@@ -65,7 +65,7 @@ void FSwitch::drawCheckButton()
   {
     if ( hasFocus() && ! button_pressed )
     {
-      
+
       if ( isMonochron() || getMaxColor() < 16 )
       {
         wcsncpy ( on, L" <On>", 6);
diff --git a/src/fterm.cpp b/src/fterm.cpp
index 3758d0c7..fa1306df 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -3391,7 +3391,7 @@ FString FTerm::getAnswerbackMsg()
     usleep(150000);  // wait 150 ms
     // read the answerback message
     if ( read(fileno(stdin), &temp, sizeof(temp)-1) > 0 )
-      answerback = temp;   
+      answerback = temp;
   }
   return answerback;
 }
diff --git a/src/ftogglebutton.cpp b/src/ftogglebutton.cpp
index 1a931c8b..30553920 100644
--- a/src/ftogglebutton.cpp
+++ b/src/ftogglebutton.cpp
@@ -65,9 +65,6 @@ void FToggleButton::init()
 
   setGeometry (1, 1, 4, 1, false);  // initialize geometry values
 
-  if ( isRadioButton() || isCheckboxButton() )
-    setVisibleCursor();
-
   if ( hasFocus() )
     this->flags = FOCUS;
 
@@ -157,7 +154,7 @@ void FToggleButton::draw()
   if ( isRadioButton() || isCheckboxButton() )
   {
     setCursorPos (xpos+xmin, ypos+ymin-1);
-    
+
     if ( isCursorInside() && hasFocus() )
     {
       if ( isHiddenCursor() )
diff --git a/test/watch.cpp b/test/watch.cpp
index 71b2e2c5..1c8d1494 100644
--- a/test/watch.cpp
+++ b/test/watch.cpp
@@ -67,7 +67,7 @@ watch::watch (FWidget* parent) : FDialog(parent)
   FButton* quit = new FButton(L"&Quit", this);
   quit->setGeometry(6, 9, 9, 1);
   quit->setShadow();
-  
+
 
   // Connect switch signal "toggled" with a callback member function
   clock_sw->addCallback
@@ -109,7 +109,7 @@ void watch::printTime()
   FString str;
   struct tm* now;
   time_t t;
-  
+
   t = time(0);  // get current time
   now = localtime(&t);