diff --git a/src/properties/proptabbar.cpp b/src/properties/proptabbar.cpp
index b9637754f..44b469ce3 100644
--- a/src/properties/proptabbar.cpp
+++ b/src/properties/proptabbar.cpp
@@ -99,6 +99,8 @@ int PropTabBar::currentIndex() const
 
 void PropTabBar::setCurrentIndex(int index)
 {
+  if(index >= m_btnGroup->buttons().size())
+    index = 0;
   // If asked to hide or if the currently selected tab is clicked
   if(index < 0 || m_currentIndex == index) {
     if(m_currentIndex >= 0) {