diff --git a/README.md b/README.md
index 2dc32a9..e24bcb7 100644
--- a/README.md
+++ b/README.md
@@ -37,9 +37,9 @@ Third, "make clean".
 This is a work in progress and lets you build with new libnx, plutonium packages. Some stuff still needs fixed to work with the new plutonium and libnx changes.
 
 ## Stuff still to fix
-~~Font sizes in menus.~~ \
-~~Threading in the main menu - to stop GUI freezing or Network installs failing.~~ \
-Options page - stop jumping back to top of page after something is selected.\
+~~Font sizes in menus.~~ Fixed \
+~~Threading in the main menu - to stop GUI freezing or Network installs failing.~~ Fixed \
+~~Options page - stop jumping back to top of page after something is selected.~~ Fixed \
 Touchscreen not working properly.\
 Crash when pressing A or + in the network install page.
 
diff --git a/source/ui/optionsPage.cpp b/source/ui/optionsPage.cpp
index 4064fbf..4f9b6e2 100644
--- a/source/ui/optionsPage.cpp
+++ b/source/ui/optionsPage.cpp
@@ -190,6 +190,7 @@ namespace inst::ui {
                     inst::config::ignoreReqVers = !inst::config::ignoreReqVers;
                     inst::config::setConfig();
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(0);
                     break;
                 case 1:
                     if (inst::config::validateNCAs) {
@@ -197,21 +198,25 @@ namespace inst::ui {
                     } else inst::config::validateNCAs = true;
                     inst::config::setConfig();
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(1);
                     break;
                 case 2:
                     inst::config::overClock = !inst::config::overClock;
                     inst::config::setConfig();
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(2);
                     break;
                 case 3:
                     inst::config::deletePrompt = !inst::config::deletePrompt;
                     inst::config::setConfig();
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(3);
                     break;
                 case 4:
                     inst::config::autoUpdate = !inst::config::autoUpdate;
                     inst::config::setConfig();
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(4);
                     break;
                 case 5:
                     if (inst::config::gayMode) {
@@ -224,6 +229,7 @@ namespace inst::ui {
                         mainApp->mainPage->awooImage->SetVisible(true);
                     }
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(5);
                     thememessage();
                     inst::config::setConfig();
                     break;
@@ -236,6 +242,7 @@ namespace inst::ui {
                         inst::config::useSound = true;
                     }
                     this->setMenuText();
+                    this->menu->SetSelectedIndex(6);
                     inst::config::setConfig();
                     break;
                 
@@ -248,6 +255,7 @@ namespace inst::ui {
                         inst::config::sigPatchesUrl = keyboardResult;
                         inst::config::setConfig();
                         this->setMenuText();
+                        this->menu->SetSelectedIndex(8);
                     }
                     break;
                 case 9: