diff --git a/src/ui/cuicommondialog.cpp b/src/ui/cuicommondialog.cpp
index dd52292f6..90350c54f 100644
--- a/src/ui/cuicommondialog.cpp
+++ b/src/ui/cuicommondialog.cpp
@@ -1,6 +1,7 @@
 #include "cuicommondialog.hpp"
 #include "cuimanager.hpp"
 #include "cuilistboxitem.hpp"
+#include "cuithememanager.hpp"
 
 namespace EE { namespace UI {
 
@@ -86,6 +87,13 @@ cUICommonDialog::cUICommonDialog( const cUICommonDialog::CreateParams& Params )
 	LBParams.Size = eeSize( Container()->Size().Width() - 12, Container()->Size().Height() - 92 );
 	LBParams.Flags = UI_AUTO_PADDING | UI_ANCHOR_RIGHT | UI_ANCHOR_LEFT | UI_ANCHOR_TOP | UI_ANCHOR_BOTTOM | UI_CLIP_ENABLE;
 	LBParams.FontSelectedColor = eeColorA( 255, 255, 255, 255 );
+
+	if ( NULL != cUIThemeManager::instance()->DefaultTheme() ) {
+		cUITheme * Theme = cUIThemeManager::instance()->DefaultTheme();
+
+		LBParams.FontSelectedColor = Theme->FontSelectedColor();
+	}
+
 	mList = eeNew( cUIListBox, ( LBParams ) );
 	mList->Visible( true );
 	mList->Enabled( true );
@@ -192,6 +200,10 @@ void cUICommonDialog::RefreshFolder() {
 	}
 
 	mList->AddListBoxItems( files );
+
+	if ( NULL != mList->VerticalScrollBar() ) {
+		mList->VerticalScrollBar()->ClickStep( 1.f / ( ( mList->Count() * mList->RowHeight() ) / (eeFloat)mList->Size().Height() ) );
+	}
 }
 
 void cUICommonDialog::OpenSaveClick() {
diff --git a/src/ui/cuiskincomplex.cpp b/src/ui/cuiskincomplex.cpp
index d188bf0ca..39367cefd 100644
--- a/src/ui/cuiskincomplex.cpp
+++ b/src/ui/cuiskincomplex.cpp
@@ -126,6 +126,9 @@ void cUISkinComplex::Draw( const eeFloat& X, const eeFloat& Y, const eeFloat& Wi
 		tShape->Draw( X + dls.Width(), Y + Height - tShape->RealSize().Height(), mTempColor );
 
 		tShape->ResetDestWidthAndHeight();
+
+		if ( dls.Height() == 0 && drs.Height() == 0 )
+			dls.Height( tShape->RealSize().Height() );
 	}
 
 	tShape = mShape[ State ][ Center ];