diff --git a/src/components/widget/RawWidget.js b/src/components/widget/RawWidget.js
index 020d24b63..f31af37fa 100644
--- a/src/components/widget/RawWidget.js
+++ b/src/components/widget/RawWidget.js
@@ -143,6 +143,10 @@ class RawWidget extends Component {
 
         const {isEdited} = this.state;
 
+        // check if it's value from MasterWidget or not
+        // (to stabilize parsing changes in masterWidget due to problems with jumping cursor
+        const widgetValue = inputValue ? inputValue : widgetData[0].value;
+
         // TODO: API SHOULD RETURN THE SAME PROPERTIES FOR FILTERS
         const widgetField = filterWidget ?
             fields[0].parameterName : fields[0].field;
@@ -322,7 +326,7 @@ class RawWidget extends Component {
                             type="text"
                             ref={c => this.rawWidget = c}
                             className="input-field js-input-field"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             placeholder={fields[0].emptyText}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
@@ -342,7 +346,7 @@ class RawWidget extends Component {
                         <textarea
                             ref={c => this.rawWidget = c}
                             className="input-field js-input-field"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             placeholder={fields[0].emptyText}
                             onFocus={this.handleFocus}
@@ -364,7 +368,7 @@ class RawWidget extends Component {
                             className="input-field js-input-field"
                             min="0"
                             step="1"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
                             onChange={(e) => handleChange && handleChange(widgetField, e.target.value)}
@@ -383,7 +387,7 @@ class RawWidget extends Component {
                             ref={c => this.rawWidget = c}
                             type="number"
                             className="input-field js-input-field"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
                             onChange={(e) => handleChange && handleChange(fields[0].field, e.target.value)}
@@ -404,7 +408,7 @@ class RawWidget extends Component {
                             className="input-field js-input-field"
                             min="0"
                             step="1"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
                             onChange={(e) =>  handleChange && handleChange(widgetField, e.target.value)}
@@ -425,7 +429,7 @@ class RawWidget extends Component {
                             className="input-field js-input-field"
                             min="0"
                             step="1"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
                             onChange={(e) =>  handleChange && handleChange(widgetField, e.target.value)}
@@ -444,7 +448,7 @@ class RawWidget extends Component {
                             ref={c => this.rawWidget = c}
                             type="number"
                             className="input-field js-input-field"
-                            value={inputValue ? inputValue : widgetData[0].value}
+                            value={widgetValue}
                             disabled={widgetData[0].readonly || disabled}
                             onFocus={this.handleFocus}
                             onChange={(e) =>  handleChange && handleChange(widgetField, e.target.value)}