diff --git a/qt_gui/main.qml b/qt_gui/main.qml
index 3e5936c..c418d37 100644
--- a/qt_gui/main.qml
+++ b/qt_gui/main.qml
@@ -168,7 +168,7 @@ ApplicationWindow
 		["Shift", "1/x", " √<span style=\"text-decoration: overline\">x</span> ",   "CL<i>x</i>"],
 		["y<sup>x</sup> ",   "ln(x)", "log(x)", "π"],
 		["R▼",      "e<sup>x</sup>",   "10<sup>x</sup>",   ""],
-		["sin(x)",      "cos(x)",      "tan(x)",       "►rad"],
+		["sin(x)",      "cos(x)",      "tan(x)",       "►deg"],
 		["off",   "STO",      "RCL",       "LAST<i>x</i>"]
 		]
 
@@ -180,7 +180,7 @@ ApplicationWindow
 		["", "", "",   ""],
 		["",   "", "", ""],
 		["R▲",      "",   "",   ""],
-		["asin(x)",      "acos(x)",   "atan(x)",       "►deg"],
+		["asin(x)",      "acos(x)",   "atan(x)",       "►rad"],
 		["",   "",      "",       ""]
 		]
 
diff --git a/src/calc.c b/src/calc.c
index 5ec1b4e..ea3ee7a 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -116,9 +116,9 @@ void process_cmd(char cmd){
 		//////////
 		case '-':{
 			if (IsShiftedUp) {
-				do_unary_op(to_radian_decn);
-			} else if (IsShiftedDown) {
 				do_unary_op(to_degree_decn);
+			} else if (IsShiftedDown) {
+				do_unary_op(to_radian_decn);
 			} else {
 				negate_decn(&stack(STACK_X));
 				do_binary_op(add_decn);