diff --git a/src/tools/rectangle/rectangletool.cpp b/src/tools/rectangle/rectangletool.cpp
index 44e33a09..530fd729 100644
--- a/src/tools/rectangle/rectangletool.cpp
+++ b/src/tools/rectangle/rectangletool.cpp
@@ -66,7 +66,12 @@ void RectangleTool::process(QPainter& painter,
         painter.drawRect(QRect(m_points.first, m_points.second));
     } else {
         painter.drawRoundedRect(
-          QRect(m_points.first, m_points.second), m_thickness, m_thickness);
+          std::min(m_points.first.x(), m_points.second.x()),
+          std::min(m_points.first.y(), m_points.second.y()),
+          std::abs(m_points.first.x() - m_points.second.x()),
+          std::abs(m_points.first.y() - m_points.second.y()),
+          m_thickness,
+          m_thickness);
     }
 }
 
diff --git a/src/tools/selection/selectiontool.cpp b/src/tools/selection/selectiontool.cpp
index 31283a53..63d6e9bd 100644
--- a/src/tools/selection/selectiontool.cpp
+++ b/src/tools/selection/selectiontool.cpp
@@ -66,12 +66,7 @@ void SelectionTool::process(QPainter& painter,
         updateBackup(pixmap);
     }
     painter.setPen(QPen(m_color, PADDING_VALUE + m_thickness));
-    if (m_thickness == 0) {
-        painter.drawRect(QRect(m_points.first, m_points.second));
-    } else {
-        painter.drawRoundedRect(
-          QRect(m_points.first, m_points.second), m_thickness, m_thickness);
-    }
+    painter.drawRect(QRect(m_points.first, m_points.second));
 }
 
 void SelectionTool::paintMousePreview(QPainter& painter,