2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index f6762a5cb..683b02fe6 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -162,7 +162,8 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
                 return;
 
 //            const unsigned char emoteId = emoteShortcut->getEmote(index);
-            const unsigned char emoteId = index + 1;
+            const unsigned char emoteId
+                = static_cast<unsigned char>(index + 1);
 
             if (emoteId)
             {
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 67882deca..7da6f9398 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -156,7 +156,7 @@ void TabbedArea::removeTab(Tab *tab)
     }
 
     if (tabIndexToBeSelected >= static_cast<signed>(mTabs.size()))
-        tabIndexToBeSelected = mTabs.size() - 1;
+        tabIndexToBeSelected = static_cast<int>(mTabs.size()) - 1;
     if (tabIndexToBeSelected < -1)
         tabIndexToBeSelected = -1;