diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 4394513..5b76d78 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -848,7 +848,43 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
                             nType = GetDlgWindowType::Next;
                             nGetFocusFlags |= GetFocusFlags::Forward;
                         }
+SAL_WARN("DEBUG","--- Calling ImplGetDlgWindow giving index["<<i<<"] type["<<(int)nType<<"] start["<<nFormStart<<"] end["<<nFormEnd<<"] and getting NewIndex["<<nNewIndex<<"]");
+                        sal_uInt16 nLastIndex = i;
                         vcl::Window* pWindow = ImplGetDlgWindow( i, nType, nFormStart, nFormEnd, &nNewIndex );
+                        while ( pWindow && pWindow->GetType() == WindowType::RADIOBUTTON && nLastIndex != nNewIndex && i != nNewIndex )
+                        {
+                            RadioButton* pRadio = static_cast<RadioButton*>(pWindow);
+                            std::vector<VclPtr<RadioButton> > aGroup(pRadio->GetRadioButtonGroup(/*bIncludeThis=*/false));
+SAL_WARN("DEBUG","--- next window is radiobox. i["<<i<<"] NewIndex["<<nNewIndex<<"] GroupSize["<<aGroup.size()<<"]  RadioCheckEnabled["<<pRadio->IsRadioCheckEnabled()<<"] isChecked?["<<pRadio->IsChecked()<<"]");
+
+                            if ( !aGroup.size() ) //only one button in group
+                                break;
+
+                            if ( pRadio->IsChecked() )
+                                break;
+
+                            nLastIndex = nNewIndex;
+                            vcl::Window* pLastWindow = pWindow;
+                            pWindow = ImplGetDlgWindow( nNewIndex, nType, nFormStart, nFormEnd, &nNewIndex );
+SAL_WARN("DEBUG","------ next window["<<pWindow<<"] isRadioButton["<<( pWindow && pWindow->GetType() == WindowType::RADIOBUTTON )<<"] NewIndex["<<nNewIndex<<"] lastIndex["<<nLastIndex<<"]");
+                            if ( pWindow && pWindow->GetType() == WindowType::RADIOBUTTON )
+                            {
+                                pRadio = static_cast<RadioButton*>(pWindow);
+                                auto aMember(std::find(aGroup.begin(), aGroup.end(), VclPtr<RadioButton>(pRadio)));
+SAL_WARN("DEBUG","------ next radiobutton isMember["<<(aMember != aGroup.end())<<"] isChecked["<<pRadio->IsChecked()<<"]");
+                                if (aMember == aGroup.end())
+                                    pWindow = nullptr;
+                            }
+                            else
+                                pWindow = nullptr;
+
+                            if ( !pWindow )
+                            {
+                                pWindow = pLastWindow;
+                                nNewIndex = nLastIndex;
+                            }
+                        }
+SAL_WARN("DEBUG","---selected window index["<<i<<"] newIndex["<<nNewIndex<<"]");
                         // if this is the same window, simulate a Get/LoseFocus,
                         // in case AROUND is being processed
                         if ( pWindow == pSWindow )